[cvs] / xvidcore / src / image / qpel.c Repository:
ViewVC logotype

Diff of /xvidcore/src/image/qpel.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.7, Mon Aug 1 10:53:46 2005 UTC revision 1.8, Tue Nov 22 10:23:01 2005 UTC
# Line 25  Line 25 
25    
26  #ifndef XVID_AUTO_INCLUDE  #ifndef XVID_AUTO_INCLUDE
27    
28    #include <stdio.h>
29    
30  #include "../portab.h"  #include "../portab.h"
31  #include "qpel.h"  #include "qpel.h"
32    
# Line 197  Line 199 
199  /* Global scope hooks  /* Global scope hooks
200   ****************************************************************************/   ****************************************************************************/
201    
202  XVID_QP_FUNCS *xvid_QP_Funcs = 0;  XVID_QP_FUNCS *xvid_QP_Funcs = NULL;
203  XVID_QP_FUNCS *xvid_QP_Add_Funcs = 0;  XVID_QP_FUNCS *xvid_QP_Add_Funcs = NULL;
204    
205  /* Reference plain C impl. declaration  /* Reference plain C impl. declaration
206   ****************************************************************************/   ****************************************************************************/
# Line 392  Line 394 
394  /* tables for ASM  /* tables for ASM
395   ****************************************************************************/   ****************************************************************************/
396    
 #ifdef ARCH_IS_IA32  
 uint16_t xvid_Expand_mmx[256][4]; /* 8b -> 64b expansion table */  
 #endif  
397    
398  #ifdef ARCH_IS_X86_64  #if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
399    /* These symbols will be used outsie this file, so tell the compiler
400     * they're global. Only ia32 will define them in this file, x86_64
401     * will do in the assembly files */
402  extern uint16_t xvid_Expand_mmx[256][4]; /* 8b -> 64b expansion table */  extern uint16_t xvid_Expand_mmx[256][4]; /* 8b -> 64b expansion table */
403    
404    extern int16_t xvid_FIR_1_0_0_0[256][4];
405    extern int16_t xvid_FIR_3_1_0_0[256][4];
406    extern int16_t xvid_FIR_6_3_1_0[256][4];
407    extern int16_t xvid_FIR_14_3_2_1[256][4];
408    extern int16_t xvid_FIR_20_6_3_1[256][4];
409    extern int16_t xvid_FIR_20_20_6_3[256][4];
410    extern int16_t xvid_FIR_23_19_6_3[256][4];
411    extern int16_t xvid_FIR_7_20_20_6[256][4];
412    extern int16_t xvid_FIR_6_20_20_6[256][4];
413    extern int16_t xvid_FIR_6_20_20_7[256][4];
414    extern int16_t xvid_FIR_3_6_20_20[256][4];
415    extern int16_t xvid_FIR_3_6_19_23[256][4];
416    extern int16_t xvid_FIR_1_3_6_20[256][4];
417    extern int16_t xvid_FIR_1_2_3_14[256][4];
418    extern int16_t xvid_FIR_0_1_3_6[256][4];
419    extern int16_t xvid_FIR_0_0_1_3[256][4];
420    extern int16_t xvid_FIR_0_0_0_1[256][4];
421  #endif  #endif
422    
423  /* Alternate way of filtering (cf. USE_TABLES flag in qpel_mmx.asm)  /* Arrays definitions, according to the target platform */
424   *  #ifdef ARCH_IS_IA32
425   * 17 tables, 2K each => 34K  uint16_t xvid_Expand_mmx[256][4]; /* 8b -> 64b expansion table */
  * Mirroring can be acheived composing 11 basic tables  
  * (for instance: (23,19,-6,3)=(20,20,-6,3)+(3,-1,0,0)  
  * Using Symmetries (and bswap) could reduce further  
  * the memory to 7 tables (->14K). */  
 #ifdef ARCH_IS_X86_64  
 #define __SCOPE extern  
 #else  
 #define __SCOPE  
426  #endif  #endif
427    
428    #if !defined(ARCH_IS_X86_64)
429    /* Only ia32 will use these tables outside this file so mark them
430    * static for all other archs */
431    #if defined(ARCH_IS_IA32)
432    #define __SCOPE
433    #else
434    #define __SCOPE static
435    #endif
436  __SCOPE int16_t xvid_FIR_1_0_0_0[256][4];  __SCOPE int16_t xvid_FIR_1_0_0_0[256][4];
437  __SCOPE int16_t xvid_FIR_3_1_0_0[256][4];  __SCOPE int16_t xvid_FIR_3_1_0_0[256][4];
438  __SCOPE int16_t xvid_FIR_6_3_1_0[256][4];  __SCOPE int16_t xvid_FIR_6_3_1_0[256][4];
# Line 430  Line 450 
450  __SCOPE int16_t xvid_FIR_0_1_3_6[256][4];  __SCOPE int16_t xvid_FIR_0_1_3_6[256][4];
451  __SCOPE int16_t xvid_FIR_0_0_1_3[256][4];  __SCOPE int16_t xvid_FIR_0_0_1_3[256][4];
452  __SCOPE int16_t xvid_FIR_0_0_0_1[256][4];  __SCOPE int16_t xvid_FIR_0_0_0_1[256][4];
453    #endif
454    
455  static void Init_FIR_Table(int16_t Tab[][4],  static void Init_FIR_Table(int16_t Tab[][4],
456                             int A, int B, int C, int D)                             int A, int B, int C, int D)
# Line 444  Line 465 
465  }  }
466    
467    
468  void xvid_Init_QP()  void xvid_Init_QP(void)
469  {  {
470  #ifdef ARCH_IS_IA32  #ifdef ARCH_IS_IA32
471          int i;          int i;

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4