[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.33.2.13, Fri Nov 8 10:10:48 2002 UTC revision 1.33.2.17, Mon Dec 9 10:47:05 2002 UTC
# Line 49  Line 49 
49  #include "dct/fdct.h"  #include "dct/fdct.h"
50  #include "image/colorspace.h"  #include "image/colorspace.h"
51  #include "image/interpolate8x8.h"  #include "image/interpolate8x8.h"
52    #include "image/reduced.h"
53  #include "utils/mem_transfer.h"  #include "utils/mem_transfer.h"
54  #include "utils/mbfunctions.h"  #include "utils/mbfunctions.h"
55  #include "quant/quant_h263.h"  #include "quant/quant_h263.h"
# Line 234  Line 235 
235          interpolate8x8_avg2 = interpolate8x8_avg2_c;          interpolate8x8_avg2 = interpolate8x8_avg2_c;
236          interpolate8x8_avg4 = interpolate8x8_avg4_c;          interpolate8x8_avg4 = interpolate8x8_avg4_c;
237    
238            /* reduced resoltuion */
239    
240            copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_C;
241            add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_C;
242    #ifdef ARCH_X86
243            vfilter_31 = xvid_VFilter_31_x86;
244            hfilter_31 = xvid_HFilter_31_x86;
245    #else
246            vfilter_31 = xvid_VFilter_31_C;
247            hfilter_31 = xvid_HFilter_31_C;
248    #endif
249            filter_18x18_to_8x8 = xvid_Filter_18x18_To_8x8_C;
250            filter_diff_18x18_to_8x8 = xvid_Filter_Diff_18x18_To_8x8_C;
251    
252          /* Initialize internal colorspace transformation tables */          /* Initialize internal colorspace transformation tables */
253          colorspace_init();          colorspace_init();
254    
# Line 334  Line 349 
349                  interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_mmx;                  interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_mmx;
350                  interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_mmx;                  interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_mmx;
351    
352  //              interpolate8x8_avg2 = interpolate8x8_avg2_mmx;                  interpolate8x8_avg2 = interpolate8x8_avg2_mmx;
353                  interpolate8x8_avg4 = interpolate8x8_avg4_mmx;                  interpolate8x8_avg4 = interpolate8x8_avg4_mmx;
354    
355                    /* reduced resolution */
356                    copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_mmx;
357                    add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_mmx;
358                    hfilter_31 = xvid_HFilter_31_mmx;
359                    filter_18x18_to_8x8 = xvid_Filter_18x18_To_8x8_mmx;
360                    filter_diff_18x18_to_8x8 = xvid_Filter_Diff_18x18_To_8x8_mmx;
361    
362                  /* image input xxx_to_yv12 related functions */                  /* image input xxx_to_yv12 related functions */
363                  yv12_to_yv12  = yv12_to_yv12_mmx;                  yv12_to_yv12  = yv12_to_yv12_mmx;
364                  bgr_to_yv12   = bgr_to_yv12_mmx;                  bgr_to_yv12   = bgr_to_yv12_mmx;
# Line 386  Line 408 
408                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;
409                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;
410    
411                    /* reduced resolution */
412                    copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_xmm;
413                    add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_xmm;
414    
415                  /* Quantization */                  /* Quantization */
416                  dequant_intra = dequant_intra_xmm;                  dequant_intra = dequant_intra_xmm;
417                  dequant_inter = dequant_inter_xmm;                  dequant_inter = dequant_inter_xmm;
# Line 487  Line 513 
513  static int  static int
514  xvid_init_convert(XVID_INIT_CONVERTINFO* convert)  xvid_init_convert(XVID_INIT_CONVERTINFO* convert)
515  {  {
516          const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP);          // const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP);
517          const int width = convert->width;          const int width = convert->width;
518          const int height = convert->height;          const int height = convert->height;
519          const int width2 = convert->width/2;          const int width2 = convert->width/2;

Legend:
Removed from v.1.33.2.13  
changed lines
  Added in v.1.33.2.17

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