[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.61, Sun Jan 16 10:34:52 2005 UTC revision 1.68, Sat Feb 25 04:41:12 2006 UTC
# Line 126  Line 126 
126    
127  /* detect cpu flags  */  /* detect cpu flags  */
128  static unsigned int  static unsigned int
129  detect_cpu_flags()  detect_cpu_flags(void)
130  {  {
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;
# Line 183  Line 183 
183          idct = idct_int32;          idct = idct_int32;
184    
185          /* Only needed on PPC Altivec archs */          /* Only needed on PPC Altivec archs */
186          sadInit = 0;          sadInit = NULL;
187    
188          /* Restore FPU context : emms_c is a nop functions */          /* Restore FPU context : emms_c is a nop functions */
189          emms = emms_c;          emms = emms_c;
# Line 213  Line 213 
213          transfer_8to16sub2ro = transfer_8to16sub2ro_c;          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            transfer8x4_copy   = transfer8x4_copy_c;
217    
218          /* Interlacing functions */          /* Interlacing functions */
219          MBFieldTest = MBFieldTest_c;          MBFieldTest = MBFieldTest_c;
# Line 222  Line 223 
223          interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_c;          interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_c;
224          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c;          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c;
225    
226            interpolate8x4_halfpel_h  = interpolate8x4_halfpel_h_c;
227            interpolate8x4_halfpel_v  = interpolate8x4_halfpel_v_c;
228            interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_c;
229    
230          interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_c;          interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_c;
231          interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_c;          interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_c;
232          interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_c;          interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_c;
# Line 340  Line 345 
345                  transfer_8to16sub2 = transfer_8to16sub2_mmx;                  transfer_8to16sub2 = transfer_8to16sub2_mmx;
346                  transfer_16to8add  = transfer_16to8add_mmx;                  transfer_16to8add  = transfer_16to8add_mmx;
347                  transfer8x8_copy   = transfer8x8_copy_mmx;                  transfer8x8_copy   = transfer8x8_copy_mmx;
348                    transfer8x4_copy   = transfer8x4_copy_mmx;
349    
350                  /* Interlacing Functions */                  /* Interlacing Functions */
351                  MBFieldTest = MBFieldTest_mmx;                  MBFieldTest = MBFieldTest_mmx;
# Line 349  Line 355 
355                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;
356                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx;
357    
358                    interpolate8x4_halfpel_h  = interpolate8x4_halfpel_h_mmx;
359                    interpolate8x4_halfpel_v  = interpolate8x4_halfpel_v_mmx;
360                    interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_mmx;
361    
362                  interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_mmx;                  interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_mmx;
363                  interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_mmx;                  interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_mmx;
364                  interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_mmx;                  interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_mmx;
# Line 416  Line 426 
426                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;
427                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;
428    
429                    interpolate8x4_halfpel_h  = interpolate8x4_halfpel_h_xmm;
430                    interpolate8x4_halfpel_v  = interpolate8x4_halfpel_v_xmm;
431                    interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_xmm;
432    
433                  interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_xmm;                  interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_xmm;
434                  interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_xmm;                  interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_xmm;
435                  interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_xmm;                  interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_xmm;
# Line 452  Line 466 
466                  interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dn;                  interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dn;
467                  interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dn;                  interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dn;
468                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dn;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dn;
469    
470                    interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_3dn;
471                    interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_3dn;
472                    interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_3dn;
473          }          }
474    
475          if ((cpu_flags & XVID_CPU_3DNOWEXT)) {          if ((cpu_flags & XVID_CPU_3DNOWEXT)) {
# Line 463  Line 481 
481                  transfer_8to16subro =  transfer_8to16subro_3dne;                  transfer_8to16subro =  transfer_8to16subro_3dne;
482                  transfer_16to8add = transfer_16to8add_3dne;                  transfer_16to8add = transfer_16to8add_3dne;
483                  transfer8x8_copy = transfer8x8_copy_3dne;                  transfer8x8_copy = transfer8x8_copy_3dne;
484                    transfer8x4_copy = transfer8x4_copy_3dne;
485    
486                  if ((cpu_flags & XVID_CPU_MMXEXT)) {                  if ((cpu_flags & XVID_CPU_MMXEXT)) {
487                          /* Inverse DCT */                          /* Inverse DCT */
# Line 476  Line 495 
495                          interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne;                          interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne;
496                          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;                          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;
497    
498                            interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_3dne;
499                            interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_3dne;
500                            interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_3dne;
501    
502                          /* Quantization */                          /* Quantization */
503                          quant_h263_intra = quant_h263_intra_3dne;               /* cmov only */                          quant_h263_intra = quant_h263_intra_3dne;               /* cmov only */
504                          quant_h263_inter = quant_h263_inter_3dne;                          quant_h263_inter = quant_h263_inter_3dne;
# Line 509  Line 532 
532                  sad16    = sad16_sse2;                  sad16    = sad16_sse2;
533                  dev16    = dev16_sse2;                  dev16    = dev16_sse2;
534    
535                  /* DCT operators                  /* DCT operators */
                  * no iDCT because it's not "Walken matching" */  
536                  fdct = fdct_sse2_skal;                  fdct = fdct_sse2_skal;
537        /* idct = idct_sse2_skal; */   /* Is now IEEE1180 and Walken compliant. Disabled until fully tested. */
538    
539                  /* postprocessing */                  /* postprocessing */
540                  image_brightness = image_brightness_sse2;                  image_brightness = image_brightness_sse2;
# Line 597  Line 620 
620            dequant_h263_intra = dequant_h263_intra_altivec_c;            dequant_h263_intra = dequant_h263_intra_altivec_c;
621            dequant_h263_inter = dequant_h263_inter_altivec_c;            dequant_h263_inter = dequant_h263_inter_altivec_c;
622    
623                      dequant_mpeg_intra = dequant_mpeg_intra_altivec_c;
624                      dequant_mpeg_inter = dequant_mpeg_inter_altivec_c;
625    
626                    /* Qpel stuff */                    /* Qpel stuff */
627                    xvid_QP_Funcs = &xvid_QP_Funcs_Altivec_C;                    xvid_QP_Funcs = &xvid_QP_Funcs_Altivec_C;
628                    xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_Altivec_C;                    xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_Altivec_C;
# Line 610  Line 636 
636           * features there really are. */           * features there really are. */
637          if (cpu_flags & XVID_CPU_ASM) {          if (cpu_flags & XVID_CPU_ASM) {
638                  /* SIMD state flusher */                  /* SIMD state flusher */
639                  emms = emms_3dn;                  emms = emms_mmx;
640    
641                  /* DCT operators */                  /* DCT operators */
642                  fdct = fdct_skal_x86_64;                  fdct = fdct_skal_x86_64;
# Line 686  Line 712 
712                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
713    
714          info->actual_version = XVID_VERSION;          info->actual_version = XVID_VERSION;
715          info->build = "xvid-1.1.0-beta1";          info->build = "xvid-1.2.0-dev";
716          info->cpu_flags = detect_cpu_flags();          info->cpu_flags = detect_cpu_flags();
   
 #if defined(_SMP) && defined(WIN32)  
         info->num_threads = pthread_num_processors_np();;  
 #else  
717          info->num_threads = 0;          info->num_threads = 0;
718    
719    #if defined(WIN32)
720      {
721        DWORD dwProcessAffinityMask, dwSystemAffinityMask;
722        if (GetProcessAffinityMask(GetCurrentProcess(), &dwProcessAffinityMask, &dwSystemAffinityMask)) {
723          int i;
724          for(i=0; i<32; i++) {
725            if ((dwProcessAffinityMask & (1<<i)))
726              info->num_threads++;
727          }
728        }
729      }
730  #endif  #endif
731    
732          return 0;          return 0;

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

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