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

Diff of /xvidcore/src/xvid.c

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

revision 1.48, Mon Mar 22 22:36:23 2004 UTC revision 1.61, Sun Jan 16 10:34:52 2005 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Native API implementation  -   *  - Native API implementation  -
5   *   *
6   *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>   *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
7   *   *
8   *  This program is free software ; you can redistribute it and/or modify   *  This program is free software ; you can redistribute it and/or modify
9   *  it under the terms of the GNU General Public License as published by   *  it under the terms of the GNU General Public License as published by
# Line 36  Line 36 
36  #include "dct/fdct.h"  #include "dct/fdct.h"
37  #include "image/colorspace.h"  #include "image/colorspace.h"
38  #include "image/interpolate8x8.h"  #include "image/interpolate8x8.h"
 #include "image/reduced.h"  
39  #include "utils/mem_transfer.h"  #include "utils/mem_transfer.h"
40  #include "utils/mbfunctions.h"  #include "utils/mbfunctions.h"
41  #include "quant/quant.h"  #include "quant/quant.h"
# Line 52  Line 51 
51  unsigned int xvid_debug = 0; /* xvid debug mask */  unsigned int xvid_debug = 0; /* xvid debug mask */
52  #endif  #endif
53    
54  #if defined(ARCH_IS_IA32)  #if (defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)) && defined(_MSC_VER)
 #if defined(_MSC_VER)  
55  #       include <windows.h>  #       include <windows.h>
56  #else  #elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || defined(ARCH_IS_PPC)
57  #       include <signal.h>  #       include <signal.h>
58  #       include <setjmp.h>  #       include <setjmp.h>
59    
# Line 78  Line 76 
76   *   0 : SIGILL was *not* signalled   *   0 : SIGILL was *not* signalled
77   *   1 : SIGILL was signalled   *   1 : SIGILL was signalled
78   */   */
79    #if (defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)) && defined(_MSC_VER)
80  int  static int
81  sigill_check(void (*func)())  sigill_check(void (*func)())
82  {  {
 #if defined(_MSC_VER)  
83          _try {          _try {
84                  func();                  func();
85          }          } _except(EXCEPTION_EXECUTE_HANDLER) {
         _except(EXCEPTION_EXECUTE_HANDLER) {  
86    
87                  if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION)                  if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION)
88                          return 1;                          return(1);
89          }          }
90          return 0;          return(0);
91  #else  }
92    #elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || defined(ARCH_IS_PPC)
93    static int
94    sigill_check(void (*func)())
95    {
96      void * old_handler;      void * old_handler;
97      int jmpret;      int jmpret;
98    
99        /* Set our SIGILL handler */
100      old_handler = signal(SIGILL, sigill_handler);      old_handler = signal(SIGILL, sigill_handler);
101      if (old_handler == SIG_ERR)  
102      {      /* Check for error */
103          return -1;      if (old_handler == SIG_ERR) {
104            return(-1);
105      }      }
106    
107        /* Save stack context, so if func triggers a SIGILL, we can still roll
108             * back to a valid CPU state */
109      jmpret = setjmp(mark);      jmpret = setjmp(mark);
110      if (jmpret == 0)  
111      {          /* If setjmp returned directly, then its returned value is 0, and we still
112             * have to test the passed func. Otherwise it means the stack context has
113             * been restored by a longjmp() call, which in our case happens only in the
114             * signal handler */
115        if (jmpret == 0) {
116          func();          func();
117      }      }
118    
119        /* Restore old signal handler */
120      signal(SIGILL, old_handler);      signal(SIGILL, old_handler);
121    
122      return jmpret;      return(jmpret);
 #endif  
123  }  }
124  #endif  #endif
125    
# Line 124  Line 131 
131          /* enable native assembly optimizations by default */          /* enable native assembly optimizations by default */
132          unsigned int cpu_flags = XVID_CPU_ASM;          unsigned int cpu_flags = XVID_CPU_ASM;
133    
134  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
135          cpu_flags |= check_cpu_features();          cpu_flags |= check_cpu_features();
136          if ((cpu_flags & XVID_CPU_SSE) && sigill_check(sse_os_trigger))          if ((cpu_flags & XVID_CPU_SSE) && sigill_check(sse_os_trigger))
137                  cpu_flags &= ~XVID_CPU_SSE;                  cpu_flags &= ~XVID_CPU_SSE;
# Line 134  Line 141 
141  #endif  #endif
142    
143  #if defined(ARCH_IS_PPC)  #if defined(ARCH_IS_PPC)
144  #if defined(ARCH_IS_PPC_ALTIVEC)          if (!sigill_check(altivec_trigger))
145          cpu_flags |= XVID_CPU_ALTIVEC;          cpu_flags |= XVID_CPU_ALTIVEC;
146  #endif  #endif
 #endif  
147    
148          return cpu_flags;          return cpu_flags;
149  }  }
# Line 204  Line 210 
210          transfer_8to16sub  = transfer_8to16sub_c;          transfer_8to16sub  = transfer_8to16sub_c;
211          transfer_8to16subro  = transfer_8to16subro_c;          transfer_8to16subro  = transfer_8to16subro_c;
212          transfer_8to16sub2 = transfer_8to16sub2_c;          transfer_8to16sub2 = transfer_8to16sub2_c;
213            transfer_8to16sub2ro = transfer_8to16sub2ro_c;
214          transfer_16to8add  = transfer_16to8add_c;          transfer_16to8add  = transfer_16to8add_c;
215          transfer8x8_copy   = transfer8x8_copy_c;          transfer8x8_copy   = transfer8x8_copy_c;
216    
# Line 215  Line 222 
222          interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_c;          interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_c;
223          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c;          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c;
224    
225            interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_c;
226            interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_c;
227            interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_c;
228            interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_c;
229    
230          interpolate16x16_lowpass_h = interpolate16x16_lowpass_h_c;          interpolate16x16_lowpass_h = interpolate16x16_lowpass_h_c;
231          interpolate16x16_lowpass_v = interpolate16x16_lowpass_v_c;          interpolate16x16_lowpass_v = interpolate16x16_lowpass_v_c;
232          interpolate16x16_lowpass_hv = interpolate16x16_lowpass_hv_c;          interpolate16x16_lowpass_hv = interpolate16x16_lowpass_hv_c;
# Line 229  Line 241 
241          interpolate8x8_avg2 = interpolate8x8_avg2_c;          interpolate8x8_avg2 = interpolate8x8_avg2_c;
242          interpolate8x8_avg4 = interpolate8x8_avg4_c;          interpolate8x8_avg4 = interpolate8x8_avg4_c;
243    
244          /* reduced resolution */          /* postprocessing */
245          copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_C;          image_brightness = image_brightness_c;
         add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_C;  
         vfilter_31 = xvid_VFilter_31_C;  
         hfilter_31 = xvid_HFilter_31_C;  
         filter_18x18_to_8x8 = xvid_Filter_18x18_To_8x8_C;  
         filter_diff_18x18_to_8x8 = xvid_Filter_Diff_18x18_To_8x8_C;  
246    
247          /* Initialize internal colorspace transformation tables */          /* Initialize internal colorspace transformation tables */
248          colorspace_init();          colorspace_init();
# Line 292  Line 299 
299          dev16      = dev16_c;          dev16      = dev16_c;
300          sad16v     = sad16v_c;          sad16v     = sad16v_c;
301          sse8_16bit = sse8_16bit_c;          sse8_16bit = sse8_16bit_c;
302            sse8_8bit  = sse8_8bit_c;
303    
304  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32)
305    
         if ((cpu_flags & XVID_CPU_ASM)) {  
                 vfilter_31 = xvid_VFilter_31_x86;  
                 hfilter_31 = xvid_HFilter_31_x86;  
         }  
   
306          if ((cpu_flags & XVID_CPU_MMX) || (cpu_flags & XVID_CPU_MMXEXT) ||          if ((cpu_flags & XVID_CPU_MMX) || (cpu_flags & XVID_CPU_MMXEXT) ||
307                  (cpu_flags & XVID_CPU_3DNOW) || (cpu_flags & XVID_CPU_3DNOWEXT) ||                  (cpu_flags & XVID_CPU_3DNOW) || (cpu_flags & XVID_CPU_3DNOWEXT) ||
308                  (cpu_flags & XVID_CPU_SSE) || (cpu_flags & XVID_CPU_SSE2))                  (cpu_flags & XVID_CPU_SSE) || (cpu_flags & XVID_CPU_SSE2))
# Line 346  Line 349 
349                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;
350                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx;
351    
352                    interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_mmx;
353                    interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_mmx;
354                    interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_mmx;
355                    interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_mmx;
356    
357                  interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_mmx;                  interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_mmx;
358                  interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_mmx;                  interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_mmx;
359    
360                  interpolate8x8_avg2 = interpolate8x8_avg2_mmx;                  interpolate8x8_avg2 = interpolate8x8_avg2_mmx;
361                  interpolate8x8_avg4 = interpolate8x8_avg4_mmx;                  interpolate8x8_avg4 = interpolate8x8_avg4_mmx;
362    
363                  /* reduced resolution */                  /* postprocessing */
364                  copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_mmx;                  image_brightness = image_brightness_mmx;
                 add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_mmx;  
                 hfilter_31 = xvid_HFilter_31_mmx;  
                 filter_18x18_to_8x8 = xvid_Filter_18x18_To_8x8_mmx;  
                 filter_diff_18x18_to_8x8 = xvid_Filter_Diff_18x18_To_8x8_mmx;  
365    
366                  /* image input xxx_to_yv12 related functions */                  /* image input xxx_to_yv12 related functions */
367                  yv12_to_yv12  = yv12_to_yv12_mmx;                  yv12_to_yv12  = yv12_to_yv12_mmx;
# Line 384  Line 388 
388                  dev16    = dev16_mmx;                  dev16    = dev16_mmx;
389                  sad16v   = sad16v_mmx;                  sad16v   = sad16v_mmx;
390                  sse8_16bit = sse8_16bit_mmx;                  sse8_16bit = sse8_16bit_mmx;
391                    sse8_8bit  = sse8_8bit_mmx;
392          }          }
393    
394          /* these 3dnow functions are faster than mmx, but slower than xmm. */          /* these 3dnow functions are faster than mmx, but slower than xmm. */
# Line 411  Line 416 
416                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;
417                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;
418    
419                  /* reduced resolution */                  interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_xmm;
420                  copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_xmm;                  interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_xmm;
421                  add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_xmm;                  interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_xmm;
422                    interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_xmm;
423    
424                  /* Quantization */                  /* Quantization */
425                  quant_mpeg_intra = quant_mpeg_intra_xmm;                  quant_mpeg_intra = quant_mpeg_intra_xmm;
# Line 424  Line 430 
430    
431                  /* Buffer transfer */                  /* Buffer transfer */
432                  transfer_8to16sub2 = transfer_8to16sub2_xmm;                  transfer_8to16sub2 = transfer_8to16sub2_xmm;
433                    transfer_8to16sub2ro = transfer_8to16sub2ro_xmm;
434    
435                  /* Colorspace transformation */                  /* Colorspace transformation */
436                  yv12_to_yv12  = yv12_to_yv12_xmm;                  yv12_to_yv12  = yv12_to_yv12_xmm;
# Line 449  Line 456 
456    
457          if ((cpu_flags & XVID_CPU_3DNOWEXT)) {          if ((cpu_flags & XVID_CPU_3DNOWEXT)) {
458    
                 /* Inverse DCT */  
                 idct =  idct_3dne;  
   
459                  /* Buffer transfer */                  /* Buffer transfer */
460                  transfer_8to16copy =  transfer_8to16copy_3dne;                  transfer_8to16copy =  transfer_8to16copy_3dne;
461                  transfer_16to8copy = transfer_16to8copy_3dne;                  transfer_16to8copy = transfer_16to8copy_3dne;
462                  transfer_8to16sub =  transfer_8to16sub_3dne;                  transfer_8to16sub =  transfer_8to16sub_3dne;
463                  transfer_8to16subro =  transfer_8to16subro_3dne;                  transfer_8to16subro =  transfer_8to16subro_3dne;
                 transfer_8to16sub2 =  transfer_8to16sub2_3dne;  
464                  transfer_16to8add = transfer_16to8add_3dne;                  transfer_16to8add = transfer_16to8add_3dne;
465                  transfer8x8_copy = transfer8x8_copy_3dne;                  transfer8x8_copy = transfer8x8_copy_3dne;
466    
467                    if ((cpu_flags & XVID_CPU_MMXEXT)) {
468                            /* Inverse DCT */
469                            idct =  idct_3dne;
470    
471                            /* Buffer transfer */
472                            transfer_8to16sub2 =  transfer_8to16sub2_3dne;
473    
474                            /* Interpolation */
475                            interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dne;
476                            interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne;
477                            interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;
478    
479                  /* Quantization */                  /* Quantization */
480                  quant_h263_intra = quant_h263_intra_3dne;                          quant_h263_intra = quant_h263_intra_3dne;               /* cmov only */
481                  quant_h263_inter = quant_h263_inter_3dne;                  quant_h263_inter = quant_h263_inter_3dne;
482                  dequant_mpeg_intra = dequant_mpeg_intra_3dne;                          dequant_mpeg_intra = dequant_mpeg_intra_3dne;   /* cmov only */
483                  dequant_mpeg_inter = dequant_mpeg_inter_3dne;                  dequant_mpeg_inter = dequant_mpeg_inter_3dne;
484                  dequant_h263_intra = dequant_h263_intra_3dne;                  dequant_h263_intra = dequant_h263_intra_3dne;
485                  dequant_h263_inter = dequant_h263_inter_3dne;                  dequant_h263_inter = dequant_h263_inter_3dne;
486    
487                  /* ME functions */                  /* ME functions */
488                  calc_cbp = calc_cbp_3dne;                  calc_cbp = calc_cbp_3dne;
489    
490                  sad16 = sad16_3dne;                  sad16 = sad16_3dne;
491                  sad8 = sad8_3dne;                  sad8 = sad8_3dne;
492                  sad16bi = sad16bi_3dne;                  sad16bi = sad16bi_3dne;
493                  sad8bi = sad8bi_3dne;                  sad8bi = sad8bi_3dne;
494                  dev16 = dev16_3dne;                  dev16 = dev16_3dne;
495                    }
                 /* Interpolation */  
                 interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dne;  
                 interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne;  
                 interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;  
496          }          }
497    
498          if ((cpu_flags & XVID_CPU_SSE2)) {          if ((cpu_flags & XVID_CPU_SSE2)) {
# Line 500  Line 512 
512                  /* DCT operators                  /* DCT operators
513                   * no iDCT because it's not "Walken matching" */                   * no iDCT because it's not "Walken matching" */
514                  fdct = fdct_sse2_skal;                  fdct = fdct_sse2_skal;
515    
516                    /* postprocessing */
517                    image_brightness = image_brightness_sse2;
518          }          }
519  #endif /* ARCH_IS_IA32 */  #endif /* ARCH_IS_IA32 */
520    
# Line 530  Line 545 
545  #endif  #endif
546    
547  #if defined(ARCH_IS_PPC)  #if defined(ARCH_IS_PPC)
548          if ((cpu_flags & XVID_CPU_ASM))          if ((cpu_flags & XVID_CPU_ALTIVEC)) {
549          {            /* sad operators */
550                  calc_cbp = calc_cbp_ppc;                    sad16 = sad16_altivec_c;
551                      sad16bi = sad16bi_altivec_c;
552                      sad8 = sad8_altivec_c;
553                      dev16 = dev16_altivec_c;
554    
555              sse8_16bit = sse8_16bit_altivec_c;
556    
557              /* mem transfer */
558              transfer_8to16copy = transfer_8to16copy_altivec_c;
559              transfer_16to8copy = transfer_16to8copy_altivec_c;
560              transfer_8to16sub = transfer_8to16sub_altivec_c;
561              transfer_8to16subro = transfer_8to16subro_altivec_c;
562              transfer_8to16sub2 = transfer_8to16sub2_altivec_c;
563              transfer_16to8add = transfer_16to8add_altivec_c;
564              transfer8x8_copy = transfer8x8_copy_altivec_c;
565    
566              /* Inverse DCT */
567              idct = idct_altivec_c;
568    
569              /* Interpolation */
570              interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_altivec_c;
571              interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_altivec_c;
572              interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_altivec_c;
573    
574              interpolate8x8_avg2 = interpolate8x8_avg2_altivec_c;
575              interpolate8x8_avg4 = interpolate8x8_avg4_altivec_c;
576    
577                      interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_altivec_c;
578                      interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_altivec_c;
579                      interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_altivec_c;
580                      interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_altivec_c;
581    
582              /* Colorspace conversion */
583              bgra_to_yv12 = bgra_to_yv12_altivec_c;
584              abgr_to_yv12 = abgr_to_yv12_altivec_c;
585              rgba_to_yv12 = rgba_to_yv12_altivec_c;
586              argb_to_yv12 = argb_to_yv12_altivec_c;
587    
588              yuyv_to_yv12 = yuyv_to_yv12_altivec_c;
589              uyvy_to_yv12 = uyvy_to_yv12_altivec_c;
590    
591              yv12_to_yuyv = yv12_to_yuyv_altivec_c;
592              yv12_to_uyvy = yv12_to_uyvy_altivec_c;
593    
594              /* Quantization */
595              quant_h263_intra = quant_h263_intra_altivec_c;
596              quant_h263_inter = quant_h263_inter_altivec_c;
597              dequant_h263_intra = dequant_h263_intra_altivec_c;
598              dequant_h263_inter = dequant_h263_inter_altivec_c;
599    
600                      /* Qpel stuff */
601                      xvid_QP_Funcs = &xvid_QP_Funcs_Altivec_C;
602                      xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_Altivec_C;
603          }          }
604    #endif
605    
606          if ((cpu_flags & XVID_CPU_ALTIVEC))  #if defined(ARCH_IS_X86_64)
607          {          /* For now, only XVID_CPU_ASM is looked for, so user can still
608                  calc_cbp = calc_cbp_altivec;           * disable asm usage the usual way. When Intel EMT64 cpus will
609                  fdct = fdct_altivec;           * be out, maybe we'll have to check more precisely what cpu
610                  idct = idct_altivec;           * features there really are. */
611                  sadInit = sadInit_altivec;          if (cpu_flags & XVID_CPU_ASM) {
612                  sad16 = sad16_altivec;                  /* SIMD state flusher */
613                  sad8 = sad8_altivec;                  emms = emms_3dn;
614                  dev16 = dev16_altivec;  
615                    /* DCT operators */
616                    fdct = fdct_skal_x86_64;
617                    idct = idct_x86_64;
618    
619                    /* SAD operators */
620                    sad16      = sad16_x86_64;
621                    sad8       = sad8_x86_64;
622                    sad16bi    = sad16bi_x86_64;
623                    sad8bi     = sad8bi_x86_64;
624                    dev16      = dev16_x86_64;
625                    sad16v     = sad16v_x86_64;
626                    sse8_16bit = sse8_16bit_x86_64;
627                    sse8_8bit  = sse8_8bit_x86_64;
628    
629                    /* Interpolation operators */
630                    interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_x86_64;
631                    interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_x86_64;
632                    interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_x86_64;
633    
634                    interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_x86_64;
635                    interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_x86_64;
636                    interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_x86_64;
637                    interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_x86_64;
638    
639                    interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_x86_64;
640                    interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_x86_64;
641    
642                    interpolate8x8_avg2 = interpolate8x8_avg2_x86_64;
643                    interpolate8x8_avg4 = interpolate8x8_avg4_x86_64;
644    
645                    /* Quantization related functions */
646                    quant_h263_intra   = quant_h263_intra_x86_64;
647                    quant_h263_inter   = quant_h263_inter_x86_64;
648                    dequant_h263_intra = dequant_h263_intra_x86_64;
649                    dequant_h263_inter = dequant_h263_inter_x86_64;
650                    quant_mpeg_intra   = quant_mpeg_intra_x86_64;
651                    quant_mpeg_inter   = quant_mpeg_inter_x86_64;
652                    dequant_mpeg_intra   = dequant_mpeg_intra_x86_64;
653                    dequant_mpeg_inter   = dequant_mpeg_inter_x86_64;
654    
655                    /* Block related functions */
656                    transfer_8to16copy  = transfer_8to16copy_x86_64;
657                    transfer_16to8copy  = transfer_16to8copy_x86_64;
658                    transfer_8to16sub   = transfer_8to16sub_x86_64;
659                    transfer_8to16subro = transfer_8to16subro_x86_64;
660                    transfer_8to16sub2  = transfer_8to16sub2_x86_64;
661                    transfer_8to16sub2ro= transfer_8to16sub2ro_x86_64;
662                    transfer_16to8add   = transfer_16to8add_x86_64;
663                    transfer8x8_copy    = transfer8x8_copy_x86_64;
664    
665                    /* Qpel stuff */
666                    xvid_QP_Funcs = &xvid_QP_Funcs_x86_64;
667                    xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_x86_64;
668    
669                    /* Interlacing Functions */
670                    MBFieldTest = MBFieldTest_x86_64;
671          }          }
672  #endif  #endif
673    
# Line 551  Line 675 
675      xvid_debug = init->debug;      xvid_debug = init->debug;
676  #endif  #endif
677    
678      return 0;      return(0);
679  }  }
680    
681    
# Line 562  Line 686 
686                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
687    
688          info->actual_version = XVID_VERSION;          info->actual_version = XVID_VERSION;
689          info->build = "xvid-1.0.0";          info->build = "xvid-1.1.0-beta1";
690          info->cpu_flags = detect_cpu_flags();          info->cpu_flags = detect_cpu_flags();
691    
692  #if defined(_SMP) && defined(WIN32)  #if defined(_SMP) && defined(WIN32)

Legend:
Removed from v.1.48  
changed lines
  Added in v.1.61

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