[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.53, Thu Apr 15 12:05:19 2004 UTC revision 1.59, Sun Dec 19 13:16:50 2004 UTC
# 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 211  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 222  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 239  Line 244 
244          /* postprocessing */          /* postprocessing */
245          image_brightness = image_brightness_c;          image_brightness = image_brightness_c;
246    
         /* reduced resolution */  
         copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_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;  
   
247          /* Initialize internal colorspace transformation tables */          /* Initialize internal colorspace transformation tables */
248          colorspace_init();          colorspace_init();
249    
# Line 306  Line 303 
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 357  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    
# Line 366  Line 363 
363                  /* postprocessing */                  /* postprocessing */
364                  image_brightness = image_brightness_mmx;                  image_brightness = image_brightness_mmx;
365    
                 /* reduced resolution */  
                 copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_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;  
   
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;
368                  bgr_to_yv12   = bgr_to_yv12_mmx;                  bgr_to_yv12   = bgr_to_yv12_mmx;
# Line 426  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 439  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 520  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 579  Line 574 
574            interpolate8x8_avg2 = interpolate8x8_avg2_altivec_c;            interpolate8x8_avg2 = interpolate8x8_avg2_altivec_c;
575            interpolate8x8_avg4 = interpolate8x8_avg4_altivec_c;            interpolate8x8_avg4 = interpolate8x8_avg4_altivec_c;
576    
577            interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_altivec_c;                    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 */            /* Colorspace conversion */
583            bgra_to_yv12 = bgra_to_yv12_altivec_c;            bgra_to_yv12 = bgra_to_yv12_altivec_c;
# Line 598  Line 596 
596            quant_h263_inter = quant_h263_inter_altivec_c;            quant_h263_inter = quant_h263_inter_altivec_c;
597            dequant_h263_intra = dequant_h263_intra_altivec_c;            dequant_h263_intra = dequant_h263_intra_altivec_c;
598            dequant_h263_inter = dequant_h263_inter_altivec_c;            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  #endif
605    

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.59

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