[svn] / branches / dev-api-4 / xvidcore / src / xvid.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/xvid.c

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

revision 1088, Mon Jul 14 12:40:16 2003 UTC revision 1127, Sat Aug 23 15:11:23 2003 UTC
# Line 19  Line 19 
19   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
20   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
21   *   *
22   * $Id: xvid.c,v 1.45.2.10 2003-07-14 12:40:16 syskin Exp $   * $Id: xvid.c,v 1.45.2.14 2003-08-23 15:11:23 edgomez Exp $
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
# Line 46  Line 46 
46  #include "utils/emms.h"  #include "utils/emms.h"
47  #include "utils/timer.h"  #include "utils/timer.h"
48  #include "bitstream/mbcoding.h"  #include "bitstream/mbcoding.h"
49    #include "image/qpel.h"
50    
51  #if defined(_DEBUG)  #if defined(_DEBUG)
52  unsigned int xvid_debug = 0; /* xvid debug mask */  unsigned int xvid_debug = 0; /* xvid debug mask */
# Line 163  Line 164 
164  {  {
165          unsigned int cpu_flags;          unsigned int cpu_flags;
166    
167          if (XVID_MAJOR(init->version) != 1) /* v1.x.x */          if (XVID_VERSION_MAJOR(init->version) != 1) /* v1.x.x */
168                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
169    
170          cpu_flags = (init->cpu_flags & XVID_CPU_FORCE) ? init->cpu_flags : detect_cpu_flags();          cpu_flags = (init->cpu_flags & XVID_CPU_FORCE) ? init->cpu_flags : detect_cpu_flags();
# Line 182  Line 183 
183          /* Restore FPU context : emms_c is a nop functions */          /* Restore FPU context : emms_c is a nop functions */
184          emms = emms_c;          emms = emms_c;
185    
186            /* Qpel stuff */
187            xvid_QP_Funcs = &xvid_QP_Funcs_C;
188            xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_C;
189            xvid_Init_QP();
190    
191          /* Quantization functions */          /* Quantization functions */
192          quant_intra   = quant_intra_c;          quant_intra   = quant_intra_c;
193          dequant_intra = dequant_intra_c;          dequant_intra = dequant_intra_c;
# Line 307  Line 313 
313                  fdct = fdct_mmx;                  fdct = fdct_mmx;
314                  idct = idct_mmx;                  idct = idct_mmx;
315    
316                    /* Qpel stuff */
317                    xvid_QP_Funcs = &xvid_QP_Funcs_mmx;
318                    xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_mmx;
319    
320                  /* Quantization related functions */                  /* Quantization related functions */
321                  quant_intra   = quant_intra_mmx;                  quant_intra   = quant_intra_mmx;
322                  dequant_intra = dequant_intra_mmx;                  dequant_intra = dequant_intra_mmx;
# Line 403  Line 413 
413                  add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_xmm;                  add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_xmm;
414    
415                  /* Quantization */                  /* Quantization */
416  //              quant4_intra = quant4_intra_xmm;                  quant4_intra = quant4_intra_xmm;
417                  quant4_inter = quant4_inter_xmm;                  quant4_inter = quant4_inter_xmm;
418    
419                  dequant_intra = dequant_intra_xmm;                  dequant_intra = dequant_intra_xmm;
# Line 451  Line 461 
461                  /* Quantization */                  /* Quantization */
462                  dequant4_intra = dequant4_intra_3dne;                  dequant4_intra = dequant4_intra_3dne;
463                  dequant4_inter = dequant4_inter_3dne;                  dequant4_inter = dequant4_inter_3dne;
464  //              quant_intra = quant_intra_3dne;                  quant_intra = quant_intra_3dne;
465                  quant_inter = quant_inter_3dne;                  quant_inter = quant_inter_3dne;
466                  dequant_intra = dequant_intra_3dne;                  dequant_intra = dequant_intra_3dne;
467                  dequant_inter = dequant_inter_3dne;                  dequant_inter = dequant_inter_3dne;
# Line 470  Line 480 
480                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;
481          }          }
482    
483    #if defined(EXPERIMENTAL_SSE2_CODE) /* mark the whole SSE2 stuff as experimental. At least on
484                                                                               my P4, it crashes... */
485          if ((cpu_flags & XVID_CPU_SSE2)) {          if ((cpu_flags & XVID_CPU_SSE2)) {
486    
487                  calc_cbp = calc_cbp_sse2;                  calc_cbp = calc_cbp_sse2;
# Line 481  Line 492 
492                  quant_inter   = quant_inter_sse2;                  quant_inter   = quant_inter_sse2;
493                  dequant_inter = dequant_inter_sse2;                  dequant_inter = dequant_inter_sse2;
494    
 #if defined(EXPERIMENTAL_SSE2_CODE)  
495                  /* ME; slower than xmm */                  /* ME; slower than xmm */
496                  sad16    = sad16_sse2;                  sad16    = sad16_sse2;
497                  dev16    = dev16_sse2;                  dev16    = dev16_sse2;
 #endif  
498                  /* Forward and Inverse DCT */                  /* Forward and Inverse DCT */
499  #if 0 /* Both function are known to be unprecise, better keep them deactivated */  #if 0 /* Both function are known to be unprecise, better keep them deactivated */
500                  idct  = idct_sse2;                  idct  = idct_sse2;
# Line 493  Line 502 
502  #endif  #endif
503          }          }
504  #endif  #endif
505    #endif
506    
507  #if defined(ARCH_IS_IA64)  #if defined(ARCH_IS_IA64)
508          if ((cpu_flags & XVID_CPU_ASM)) { /* use assembler routines? */          if ((cpu_flags & XVID_CPU_ASM)) { /* use assembler routines? */
# Line 549  Line 559 
559  static int  static int
560  xvid_gbl_info(xvid_gbl_info_t * info)  xvid_gbl_info(xvid_gbl_info_t * info)
561  {  {
562          if (XVID_MAJOR(info->version) != 1) /* v1.x.x */          if (XVID_VERSION_MAJOR(info->version) != 1) /* v1.x.x */
563                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
564    
565          info->actual_version = XVID_VERSION;          info->actual_version = XVID_VERSION;
# Line 575  Line 585 
585          int height2;          int height2;
586          IMAGE img;          IMAGE img;
587    
588          if (XVID_MAJOR(convert->version) != 1)   /* v1.x.x */          if (XVID_VERSION_MAJOR(convert->version) != 1)   /* v1.x.x */
589                return XVID_ERR_VERSION;                return XVID_ERR_VERSION;
590    
591  #if 0  #if 0
Legend:
Removed from v.1088  
changed lines
  Added in v.1127
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4