[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.63, Mon May 23 12:06:02 2005 UTC revision 1.70, Mon Jul 10 08:09:59 2006 UTC
# Line 40  Line 40 
40  #include "utils/mbfunctions.h"  #include "utils/mbfunctions.h"
41  #include "quant/quant.h"  #include "quant/quant.h"
42  #include "motion/motion.h"  #include "motion/motion.h"
43    #include "motion/gmc.h"
44  #include "motion/sad.h"  #include "motion/sad.h"
45  #include "utils/emms.h"  #include "utils/emms.h"
46  #include "utils/timer.h"  #include "utils/timer.h"
# Line 126  Line 127 
127    
128  /* detect cpu flags  */  /* detect cpu flags  */
129  static unsigned int  static unsigned int
130  detect_cpu_flags()  detect_cpu_flags(void)
131  {  {
132          /* enable native assembly optimizations by default */          /* enable native assembly optimizations by default */
133          unsigned int cpu_flags = XVID_CPU_ASM;          unsigned int cpu_flags = XVID_CPU_ASM;
# Line 183  Line 184 
184          idct = idct_int32;          idct = idct_int32;
185    
186          /* Only needed on PPC Altivec archs */          /* Only needed on PPC Altivec archs */
187          sadInit = 0;          sadInit = NULL;
188    
189          /* Restore FPU context : emms_c is a nop functions */          /* Restore FPU context : emms_c is a nop functions */
190          emms = emms_c;          emms = emms_c;
# Line 213  Line 214 
214          transfer_8to16sub2ro = transfer_8to16sub2ro_c;          transfer_8to16sub2ro = transfer_8to16sub2ro_c;
215          transfer_16to8add  = transfer_16to8add_c;          transfer_16to8add  = transfer_16to8add_c;
216          transfer8x8_copy   = transfer8x8_copy_c;          transfer8x8_copy   = transfer8x8_copy_c;
217            transfer8x4_copy   = transfer8x4_copy_c;
218    
219          /* Interlacing functions */          /* Interlacing functions */
220          MBFieldTest = MBFieldTest_c;          MBFieldTest = MBFieldTest_c;
# Line 222  Line 224 
224          interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_c;          interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_c;
225          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c;          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c;
226    
227            interpolate8x4_halfpel_h  = interpolate8x4_halfpel_h_c;
228            interpolate8x4_halfpel_v  = interpolate8x4_halfpel_v_c;
229            interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_c;
230    
231          interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_c;          interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_c;
232          interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_c;          interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_c;
233          interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_c;          interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_c;
# Line 301  Line 307 
307          sse8_16bit = sse8_16bit_c;          sse8_16bit = sse8_16bit_c;
308          sse8_8bit  = sse8_8bit_c;          sse8_8bit  = sse8_8bit_c;
309    
310            init_GMC(cpu_flags);
311    
312  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32)
313    
314          if ((cpu_flags & XVID_CPU_MMX) || (cpu_flags & XVID_CPU_MMXEXT) ||          if ((cpu_flags & XVID_CPU_MMX) || (cpu_flags & XVID_CPU_MMXEXT) ||
# Line 340  Line 348 
348                  transfer_8to16sub2 = transfer_8to16sub2_mmx;                  transfer_8to16sub2 = transfer_8to16sub2_mmx;
349                  transfer_16to8add  = transfer_16to8add_mmx;                  transfer_16to8add  = transfer_16to8add_mmx;
350                  transfer8x8_copy   = transfer8x8_copy_mmx;                  transfer8x8_copy   = transfer8x8_copy_mmx;
351                    transfer8x4_copy   = transfer8x4_copy_mmx;
352    
353                  /* Interlacing Functions */                  /* Interlacing Functions */
354                  MBFieldTest = MBFieldTest_mmx;                  MBFieldTest = MBFieldTest_mmx;
# Line 349  Line 358 
358                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;
359                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx;
360    
361                    interpolate8x4_halfpel_h  = interpolate8x4_halfpel_h_mmx;
362                    interpolate8x4_halfpel_v  = interpolate8x4_halfpel_v_mmx;
363                    interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_mmx;
364    
365                  interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_mmx;                  interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_mmx;
366                  interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_mmx;                  interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_mmx;
367                  interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_mmx;                  interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_mmx;
# Line 416  Line 429 
429                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;
430                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;
431    
432                    interpolate8x4_halfpel_h  = interpolate8x4_halfpel_h_xmm;
433                    interpolate8x4_halfpel_v  = interpolate8x4_halfpel_v_xmm;
434                    interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_xmm;
435    
436                  interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_xmm;                  interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_xmm;
437                  interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_xmm;                  interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_xmm;
438                  interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_xmm;                  interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_xmm;
439                  interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_xmm;                  interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_xmm;
440    
441                  /* Quantization */                  /* Quantization */
                 quant_mpeg_intra = quant_mpeg_intra_xmm;  
442                  quant_mpeg_inter = quant_mpeg_inter_xmm;                  quant_mpeg_inter = quant_mpeg_inter_xmm;
443    
444                  dequant_h263_intra = dequant_h263_intra_xmm;                  dequant_h263_intra = dequant_h263_intra_xmm;
# Line 452  Line 468 
468                  interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dn;                  interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dn;
469                  interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dn;                  interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dn;
470                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dn;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dn;
471    
472                    interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_3dn;
473                    interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_3dn;
474                    interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_3dn;
475          }          }
476    
477          if ((cpu_flags & XVID_CPU_3DNOWEXT)) {          if ((cpu_flags & XVID_CPU_3DNOWEXT)) {
# Line 463  Line 483 
483                  transfer_8to16subro =  transfer_8to16subro_3dne;                  transfer_8to16subro =  transfer_8to16subro_3dne;
484                  transfer_16to8add = transfer_16to8add_3dne;                  transfer_16to8add = transfer_16to8add_3dne;
485                  transfer8x8_copy = transfer8x8_copy_3dne;                  transfer8x8_copy = transfer8x8_copy_3dne;
486                    transfer8x4_copy = transfer8x4_copy_3dne;
487    
488                  if ((cpu_flags & XVID_CPU_MMXEXT)) {                  if ((cpu_flags & XVID_CPU_MMXEXT)) {
489                          /* Inverse DCT */                          /* Inverse DCT */
# Line 476  Line 497 
497                          interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne;                          interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne;
498                          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;                          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;
499    
500                            interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_3dne;
501                            interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_3dne;
502                            interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_3dne;
503    
504                          /* Quantization */                          /* Quantization */
505                          quant_h263_intra = quant_h263_intra_3dne;               /* cmov only */                          quant_h263_intra = quant_h263_intra_3dne;               /* cmov only */
506                          quant_h263_inter = quant_h263_inter_3dne;                          quant_h263_inter = quant_h263_inter_3dne;
# Line 613  Line 638 
638           * features there really are. */           * features there really are. */
639          if (cpu_flags & XVID_CPU_ASM) {          if (cpu_flags & XVID_CPU_ASM) {
640                  /* SIMD state flusher */                  /* SIMD state flusher */
641                  emms = emms_3dn;                  emms = emms_mmx;
642    
643                  /* DCT operators */                  /* DCT operators */
644                  fdct = fdct_skal_x86_64;                  fdct = fdct_skal_x86_64;
# Line 650  Line 675 
675                  quant_h263_inter   = quant_h263_inter_x86_64;                  quant_h263_inter   = quant_h263_inter_x86_64;
676                  dequant_h263_intra = dequant_h263_intra_x86_64;                  dequant_h263_intra = dequant_h263_intra_x86_64;
677                  dequant_h263_inter = dequant_h263_inter_x86_64;                  dequant_h263_inter = dequant_h263_inter_x86_64;
678                  quant_mpeg_intra   = quant_mpeg_intra_x86_64;                  /*quant_mpeg_intra   = quant_mpeg_intra_x86_64; fix me! */
679                  quant_mpeg_inter   = quant_mpeg_inter_x86_64;                  quant_mpeg_inter   = quant_mpeg_inter_x86_64;
680                  dequant_mpeg_intra   = dequant_mpeg_intra_x86_64;                  dequant_mpeg_intra   = dequant_mpeg_intra_x86_64;
681                  dequant_mpeg_inter   = dequant_mpeg_inter_x86_64;                  dequant_mpeg_inter   = dequant_mpeg_inter_x86_64;
# Line 689  Line 714 
714                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
715    
716          info->actual_version = XVID_VERSION;          info->actual_version = XVID_VERSION;
717          info->build = "xvid-1.1.0-beta2";          info->build = "xvid-1.2.0-dev";
718          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  
719          info->num_threads = 0;          info->num_threads = 0;
720    
721    #if defined(WIN32)
722      {
723        DWORD dwProcessAffinityMask, dwSystemAffinityMask;
724        if (GetProcessAffinityMask(GetCurrentProcess(), &dwProcessAffinityMask, &dwSystemAffinityMask)) {
725          int i;
726          for(i=0; i<32; i++) {
727            if ((dwProcessAffinityMask & (1<<i)))
728              info->num_threads++;
729          }
730        }
731      }
732  #endif  #endif
733    
734          return 0;          return 0;

Legend:
Removed from v.1.63  
changed lines
  Added in v.1.70

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