[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.48.2.5, Sun Aug 29 10:56:57 2004 UTC revision 1.51, Mon Apr 12 14:05:08 2004 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Native API implementation  -   *  - Native API implementation  -
5   *   *
6   *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>   *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
7   *   *
8   *  This program is free software ; you can redistribute it and/or modify   *  This program is free software ; you can redistribute it and/or modify
9   *  it under the terms of the GNU General Public License as published by   *  it under the terms of the GNU General Public License as published by
# 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 229  Line 236 
236          interpolate8x8_avg2 = interpolate8x8_avg2_c;          interpolate8x8_avg2 = interpolate8x8_avg2_c;
237          interpolate8x8_avg4 = interpolate8x8_avg4_c;          interpolate8x8_avg4 = interpolate8x8_avg4_c;
238    
239            /* postprocessing */
240            image_brightness = image_brightness_c;
241    
242          /* reduced resolution */          /* reduced resolution */
243          copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_C;          copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_C;
244          add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_C;          add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_C;
# Line 352  Line 362 
362                  interpolate8x8_avg2 = interpolate8x8_avg2_mmx;                  interpolate8x8_avg2 = interpolate8x8_avg2_mmx;
363                  interpolate8x8_avg4 = interpolate8x8_avg4_mmx;                  interpolate8x8_avg4 = interpolate8x8_avg4_mmx;
364    
365                    /* postprocessing */
366                    image_brightness = image_brightness_mmx;
367    
368                  /* reduced resolution */                  /* reduced resolution */
369                  copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_mmx;                  copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_mmx;
370                  add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_mmx;                  add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_mmx;
# Line 535  Line 548 
548  #endif  #endif
549    
550  #if defined(ARCH_IS_PPC)  #if defined(ARCH_IS_PPC)
551          if ((cpu_flags & XVID_CPU_ASM))          if ((cpu_flags & XVID_CPU_ALTIVEC)) {
552          {            /* sad operators */
553                  calc_cbp = calc_cbp_ppc;            sad16 = sad16_altivec_c;
554          }            sad16bi = sad16bi_altivec_c;
555              sad8 = sad8_altivec_c;
556              dev16 = dev16_altivec_c;
557    
558              sse8_16bit = sse8_16bit_altivec_c;
559    
560              /* mem transfer */
561              transfer_8to16copy = transfer_8to16copy_altivec_c;
562              transfer_16to8copy = transfer_16to8copy_altivec_c;
563              transfer_8to16sub = transfer_8to16sub_altivec_c;
564              transfer_8to16subro = transfer_8to16subro_altivec_c;
565              transfer_8to16sub2 = transfer_8to16sub2_altivec_c;
566              transfer_16to8add = transfer_16to8add_altivec_c;
567              transfer8x8_copy = transfer8x8_copy_altivec_c;
568    
569          if ((cpu_flags & XVID_CPU_ALTIVEC))            /* Inverse DCT */
570          {            idct = idct_altivec_c;
571                  calc_cbp = calc_cbp_altivec;  
572                  fdct = fdct_altivec;            /* Interpolation */
573                  idct = idct_altivec;            interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_altivec_c;
574                  sadInit = sadInit_altivec;            interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_altivec_c;
575                  sad16 = sad16_altivec;            interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_altivec_c;
576                  sad8 = sad8_altivec;  
577                  dev16 = dev16_altivec;            interpolate8x8_avg2 = interpolate8x8_avg2_altivec_c;
578              interpolate8x8_avg4 = interpolate8x8_avg4_altivec_c;
579    
580              interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_altivec_c;
581    
582              /* Colorspace conversion */
583              bgra_to_yv12 = bgra_to_yv12_altivec_c;
584              abgr_to_yv12 = abgr_to_yv12_altivec_c;
585              rgba_to_yv12 = rgba_to_yv12_altivec_c;
586              argb_to_yv12 = argb_to_yv12_altivec_c;
587    
588              yuyv_to_yv12 = yuyv_to_yv12_altivec_c;
589              uyvy_to_yv12 = uyvy_to_yv12_altivec_c;
590    
591              yv12_to_yuyv = yv12_to_yuyv_altivec_c;
592              yv12_to_uyvy = yv12_to_uyvy_altivec_c;
593    
594              /* Quantization */
595              quant_h263_intra = quant_h263_intra_altivec_c;
596              quant_h263_inter = quant_h263_inter_altivec_c;
597              dequant_h263_intra = dequant_h263_intra_altivec_c;
598              dequant_h263_inter = dequant_h263_inter_altivec_c;
599          }          }
600  #endif  #endif
601    
# Line 556  Line 603 
603      xvid_debug = init->debug;      xvid_debug = init->debug;
604  #endif  #endif
605    
606      return 0;      return(0);
607  }  }
608    
609    
# Line 567  Line 614 
614                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
615    
616          info->actual_version = XVID_VERSION;          info->actual_version = XVID_VERSION;
617          info->build = "xvid-1.0.2";          info->build = "xvid-1.0.0";
618          info->cpu_flags = detect_cpu_flags();          info->cpu_flags = detect_cpu_flags();
619    
620  #if defined(_SMP) && defined(WIN32)  #if defined(_SMP) && defined(WIN32)
Legend:
Removed from v.1.48.2.5  
changed lines
  Added in v.1.51
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4