[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.49, Thu Apr 1 11:11:28 2004 UTC revision 1.53, Thu Apr 15 12:05:19 2004 UTC
# Line 52  Line 52 
52  unsigned int xvid_debug = 0; /* xvid debug mask */  unsigned int xvid_debug = 0; /* xvid debug mask */
53  #endif  #endif
54    
55  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32) && defined(_MSC_VER)
 #if defined(_MSC_VER)  
56  #       include <windows.h>  #       include <windows.h>
57  #else  #elif defined(ARCH_IS_IA32) || defined(ARCH_IS_PPC)
58  #       include <signal.h>  #       include <signal.h>
59  #       include <setjmp.h>  #       include <setjmp.h>
60    
# Line 78  Line 77 
77   *   0 : SIGILL was *not* signalled   *   0 : SIGILL was *not* signalled
78   *   1 : SIGILL was signalled   *   1 : SIGILL was signalled
79   */   */
80    #if defined(ARCH_IS_IA32) && defined(_MSC_VER)
81  int  static int
82  sigill_check(void (*func)())  sigill_check(void (*func)())
83  {  {
 #if defined(_MSC_VER)  
84          _try {          _try {
85                  func();                  func();
86          }          } _except(EXCEPTION_EXECUTE_HANDLER) {
         _except(EXCEPTION_EXECUTE_HANDLER) {  
87    
88                  if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION)                  if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION)
89                          return 1;                          return(1);
90          }          }
91          return 0;          return(0);
92  #else  }
93    #elif defined(ARCH_IS_IA32) || defined(ARCH_IS_PPC)
94    static int
95    sigill_check(void (*func)())
96    {
97      void * old_handler;      void * old_handler;
98      int jmpret;      int jmpret;
99    
100        /* Set our SIGILL handler */
101      old_handler = signal(SIGILL, sigill_handler);      old_handler = signal(SIGILL, sigill_handler);
102      if (old_handler == SIG_ERR)  
103      {      /* Check for error */
104          return -1;      if (old_handler == SIG_ERR) {
105            return(-1);
106      }      }
107    
108        /* Save stack context, so if func triggers a SIGILL, we can still roll
109             * back to a valid CPU state */
110      jmpret = setjmp(mark);      jmpret = setjmp(mark);
111      if (jmpret == 0)  
112      {          /* If setjmp returned directly, then its returned value is 0, and we still
113             * have to test the passed func. Otherwise it means the stack context has
114             * been restored by a longjmp() call, which in our case happens only in the
115             * signal handler */
116        if (jmpret == 0) {
117          func();          func();
118      }      }
119    
120        /* Restore old signal handler */
121      signal(SIGILL, old_handler);      signal(SIGILL, old_handler);
122    
123      return jmpret;      return(jmpret);
 #endif  
124  }  }
125  #endif  #endif
126    
# Line 134  Line 142 
142  #endif  #endif
143    
144  #if defined(ARCH_IS_PPC)  #if defined(ARCH_IS_PPC)
145  #if defined(ARCH_IS_PPC_ALTIVEC)          if (!sigill_check(altivec_trigger))
146          cpu_flags |= XVID_CPU_ALTIVEC;          cpu_flags |= XVID_CPU_ALTIVEC;
147  #endif  #endif
 #endif  
148    
149          return cpu_flags;          return cpu_flags;
150  }  }
# Line 295  Line 302 
302          dev16      = dev16_c;          dev16      = dev16_c;
303          sad16v     = sad16v_c;          sad16v     = sad16v_c;
304          sse8_16bit = sse8_16bit_c;          sse8_16bit = sse8_16bit_c;
305            sse8_8bit  = sse8_8bit_c;
306    
307  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32)
308    
# Line 390  Line 398 
398                  dev16    = dev16_mmx;                  dev16    = dev16_mmx;
399                  sad16v   = sad16v_mmx;                  sad16v   = sad16v_mmx;
400                  sse8_16bit = sse8_16bit_mmx;                  sse8_16bit = sse8_16bit_mmx;
401                    sse8_8bit  = sse8_8bit_mmx;
402          }          }
403    
404          /* these 3dnow functions are faster than mmx, but slower than xmm. */          /* these 3dnow functions are faster than mmx, but slower than xmm. */
# Line 455  Line 464 
464    
465          if ((cpu_flags & XVID_CPU_3DNOWEXT)) {          if ((cpu_flags & XVID_CPU_3DNOWEXT)) {
466    
                 /* Inverse DCT */  
                 idct =  idct_3dne;  
   
467                  /* Buffer transfer */                  /* Buffer transfer */
468                  transfer_8to16copy =  transfer_8to16copy_3dne;                  transfer_8to16copy =  transfer_8to16copy_3dne;
469                  transfer_16to8copy = transfer_16to8copy_3dne;                  transfer_16to8copy = transfer_16to8copy_3dne;
470                  transfer_8to16sub =  transfer_8to16sub_3dne;                  transfer_8to16sub =  transfer_8to16sub_3dne;
471                  transfer_8to16subro =  transfer_8to16subro_3dne;                  transfer_8to16subro =  transfer_8to16subro_3dne;
                 transfer_8to16sub2 =  transfer_8to16sub2_3dne;  
472                  transfer_16to8add = transfer_16to8add_3dne;                  transfer_16to8add = transfer_16to8add_3dne;
473                  transfer8x8_copy = transfer8x8_copy_3dne;                  transfer8x8_copy = transfer8x8_copy_3dne;
474    
475                    if ((cpu_flags & XVID_CPU_MMXEXT)) {
476                            /* Inverse DCT */
477                            idct =  idct_3dne;
478    
479                            /* Buffer transfer */
480                            transfer_8to16sub2 =  transfer_8to16sub2_3dne;
481    
482                            /* Interpolation */
483                            interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dne;
484                            interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne;
485                            interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;
486    
487                  /* Quantization */                  /* Quantization */
488                  quant_h263_intra = quant_h263_intra_3dne;                          quant_h263_intra = quant_h263_intra_3dne;               /* cmov only */
489                  quant_h263_inter = quant_h263_inter_3dne;                  quant_h263_inter = quant_h263_inter_3dne;
490                  dequant_mpeg_intra = dequant_mpeg_intra_3dne;                          dequant_mpeg_intra = dequant_mpeg_intra_3dne;   /* cmov only */
491                  dequant_mpeg_inter = dequant_mpeg_inter_3dne;                  dequant_mpeg_inter = dequant_mpeg_inter_3dne;
492                  dequant_h263_intra = dequant_h263_intra_3dne;                  dequant_h263_intra = dequant_h263_intra_3dne;
493                  dequant_h263_inter = dequant_h263_inter_3dne;                  dequant_h263_inter = dequant_h263_inter_3dne;
494    
495                  /* ME functions */                  /* ME functions */
496                  calc_cbp = calc_cbp_3dne;                  calc_cbp = calc_cbp_3dne;
497    
498                  sad16 = sad16_3dne;                  sad16 = sad16_3dne;
499                  sad8 = sad8_3dne;                  sad8 = sad8_3dne;
500                  sad16bi = sad16bi_3dne;                  sad16bi = sad16bi_3dne;
501                  sad8bi = sad8bi_3dne;                  sad8bi = sad8bi_3dne;
502                  dev16 = dev16_3dne;                  dev16 = dev16_3dne;
503                    }
                 /* Interpolation */  
                 interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dne;  
                 interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne;  
                 interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne;  
504          }          }
505    
506          if ((cpu_flags & XVID_CPU_SSE2)) {          if ((cpu_flags & XVID_CPU_SSE2)) {
# Line 536  Line 550 
550  #endif  #endif
551    
552  #if defined(ARCH_IS_PPC)  #if defined(ARCH_IS_PPC)
553          if ((cpu_flags & XVID_CPU_ASM))          if ((cpu_flags & XVID_CPU_ALTIVEC)) {
554          {            /* sad operators */
555                  calc_cbp = calc_cbp_ppc;            sad16 = sad16_altivec_c;
556          }            sad16bi = sad16bi_altivec_c;
557              sad8 = sad8_altivec_c;
558              dev16 = dev16_altivec_c;
559    
560              sse8_16bit = sse8_16bit_altivec_c;
561    
562              /* mem transfer */
563              transfer_8to16copy = transfer_8to16copy_altivec_c;
564              transfer_16to8copy = transfer_16to8copy_altivec_c;
565              transfer_8to16sub = transfer_8to16sub_altivec_c;
566              transfer_8to16subro = transfer_8to16subro_altivec_c;
567              transfer_8to16sub2 = transfer_8to16sub2_altivec_c;
568              transfer_16to8add = transfer_16to8add_altivec_c;
569              transfer8x8_copy = transfer8x8_copy_altivec_c;
570    
571          if ((cpu_flags & XVID_CPU_ALTIVEC))            /* Inverse DCT */
572          {            idct = idct_altivec_c;
573                  calc_cbp = calc_cbp_altivec;  
574                  fdct = fdct_altivec;            /* Interpolation */
575                  idct = idct_altivec;            interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_altivec_c;
576                  sadInit = sadInit_altivec;            interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_altivec_c;
577                  sad16 = sad16_altivec;            interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_altivec_c;
578                  sad8 = sad8_altivec;  
579                  dev16 = dev16_altivec;            interpolate8x8_avg2 = interpolate8x8_avg2_altivec_c;
580              interpolate8x8_avg4 = interpolate8x8_avg4_altivec_c;
581    
582              interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_altivec_c;
583    
584              /* Colorspace conversion */
585              bgra_to_yv12 = bgra_to_yv12_altivec_c;
586              abgr_to_yv12 = abgr_to_yv12_altivec_c;
587              rgba_to_yv12 = rgba_to_yv12_altivec_c;
588              argb_to_yv12 = argb_to_yv12_altivec_c;
589    
590              yuyv_to_yv12 = yuyv_to_yv12_altivec_c;
591              uyvy_to_yv12 = uyvy_to_yv12_altivec_c;
592    
593              yv12_to_yuyv = yv12_to_yuyv_altivec_c;
594              yv12_to_uyvy = yv12_to_uyvy_altivec_c;
595    
596              /* Quantization */
597              quant_h263_intra = quant_h263_intra_altivec_c;
598              quant_h263_inter = quant_h263_inter_altivec_c;
599              dequant_h263_intra = dequant_h263_intra_altivec_c;
600              dequant_h263_inter = dequant_h263_inter_altivec_c;
601          }          }
602  #endif  #endif
603    
# Line 557  Line 605 
605      xvid_debug = init->debug;      xvid_debug = init->debug;
606  #endif  #endif
607    
608      return 0;      return(0);
609  }  }
610    
611    
# Line 568  Line 616 
616                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
617    
618          info->actual_version = XVID_VERSION;          info->actual_version = XVID_VERSION;
619          info->build = "xvid-1.0.0";          info->build = "xvid-1.1-cvshead";
620          info->cpu_flags = detect_cpu_flags();          info->cpu_flags = detect_cpu_flags();
621    
622  #if defined(_SMP) && defined(WIN32)  #if defined(_SMP) && defined(WIN32)

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

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