[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.20, Fri Jun 21 16:12:47 2002 UTC revision 1.30, Tue Jul 16 11:15:15 2002 UTC
# Line 27  Line 27 
27   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
28   *   *
29   ****************************************************************************/   ****************************************************************************/
30    
31  /*****************************************************************************  /*****************************************************************************
32   *   *
33   *  History   *  History
34   *   *
35     *      - 23.06.2002    added XVID_CPU_CHKONLY
36   *  - 17.03.2002        Added interpolate8x8_halfpel_hv_xmm   *  - 17.03.2002        Added interpolate8x8_halfpel_hv_xmm
37   *  - 22.12.2001  API change: added xvid_init() - Isibaar   *  - 22.12.2001  API change: added xvid_init() - Isibaar
38   *  - 16.12.2001        inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>   *  - 16.12.2001        inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
# Line 50  Line 52 
52  #include "utils/mem_transfer.h"  #include "utils/mem_transfer.h"
53  #include "quant/quant_h263.h"  #include "quant/quant_h263.h"
54  #include "quant/quant_mpeg4.h"  #include "quant/quant_mpeg4.h"
55    #include "motion/motion.h"
56  #include "motion/sad.h"  #include "motion/sad.h"
57  #include "utils/emms.h"  #include "utils/emms.h"
58  #include "utils/timer.h"  #include "utils/timer.h"
# Line 80  Line 83 
83    
84          init_param = (XVID_INIT_PARAM *) param1;          init_param = (XVID_INIT_PARAM *) param1;
85    
86            /* Inform the client the API version */
87            init_param->api_version = API_VERSION;
88    
89            /* Inform the client the core build - unused because we're still alpha */
90            init_param->core_build = 1000;
91    
92            if ((init_param->cpu_flags & XVID_CPU_CHKONLY))
93            {
94                    init_param->cpu_flags = check_cpu_features();
95                    return XVID_ERR_OK;
96            }
97    
98          /* Do we have to force CPU features  ? */          /* Do we have to force CPU features  ? */
99          if ((init_param->cpu_flags & XVID_CPU_FORCE) > 0) {          if ((init_param->cpu_flags & XVID_CPU_FORCE) > 0) {
100                  cpu_flags = init_param->cpu_flags;                  cpu_flags = init_param->cpu_flags;
101          } else {          } else {
102    
 #ifdef ARCH_X86  
103                  cpu_flags = check_cpu_features();                  cpu_flags = check_cpu_features();
 #else  
                 cpu_flags = 0;  
 #endif  
104                  init_param->cpu_flags = cpu_flags;                  init_param->cpu_flags = cpu_flags;
105          }          }
106    
# Line 158  Line 169 
169          sad16bi  = sad16bi_c;          sad16bi  = sad16bi_c;
170          sad8     = sad8_c;          sad8     = sad8_c;
171          dev16    = dev16_c;          dev16    = dev16_c;
172            Halfpel8_Refine = Halfpel8_Refine_c;
173    
174  #ifdef ARCH_X86  #ifdef ARCH_X86
175          if ((cpu_flags & XVID_CPU_MMX) > 0) {          if ((cpu_flags & XVID_CPU_MMX) > 0) {
# Line 184  Line 196 
196                  transfer_8to16copy = transfer_8to16copy_mmx;                  transfer_8to16copy = transfer_8to16copy_mmx;
197                  transfer_16to8copy = transfer_16to8copy_mmx;                  transfer_16to8copy = transfer_16to8copy_mmx;
198                  transfer_8to16sub  = transfer_8to16sub_mmx;                  transfer_8to16sub  = transfer_8to16sub_mmx;
199                    transfer_8to16sub2 = transfer_8to16sub2_mmx;
200                  transfer_16to8add  = transfer_16to8add_mmx;                  transfer_16to8add  = transfer_16to8add_mmx;
201                  transfer8x8_copy   = transfer8x8_copy_mmx;                  transfer8x8_copy   = transfer8x8_copy_mmx;
202    
203    
204                  /* Image Interpolation related functions */                  /* Image Interpolation related functions */
205                  interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_mmx;                  interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_mmx;
206                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;
# Line 223  Line 237 
237                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;
238                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;
239    
240                    /* Quantization */
241                    dequant_intra = dequant_intra_xmm;
242                    dequant_inter = dequant_inter_xmm;
243    
244                  /* Buffer transfer */                  /* Buffer transfer */
245                  transfer_8to16sub2 = transfer_8to16sub2_xmm;                  transfer_8to16sub2 = transfer_8to16sub2_xmm;
246    
# Line 231  Line 249 
249    
250                  /* ME functions */                  /* ME functions */
251                  sad16 = sad16_xmm;                  sad16 = sad16_xmm;
252                    sad16bi = sad16bi_xmm;
253                  sad8  = sad8_xmm;                  sad8  = sad8_xmm;
254                  dev16 = dev16_xmm;                  dev16 = dev16_xmm;
255    
# Line 247  Line 266 
266          if ((cpu_flags & XVID_CPU_SSE2) > 0) {          if ((cpu_flags & XVID_CPU_SSE2) > 0) {
267  #ifdef EXPERIMENTAL_SSE2_CODE  #ifdef EXPERIMENTAL_SSE2_CODE
268    
269                    calc_cbp = calc_cbp_sse2;
270    
271                  /* Quantization */                  /* Quantization */
272                  quant_intra   = quant_intra_sse2;                  quant_intra   = quant_intra_sse2;
273                  dequant_intra = dequant_intra_sse2;                  dequant_intra = dequant_intra_sse2;
# Line 254  Line 275 
275                  dequant_inter = dequant_inter_sse2;                  dequant_inter = dequant_inter_sse2;
276    
277                  /* ME */                  /* ME */
                 calc_cbp = calc_cbp_sse2;  
278                  sad16    = sad16_sse2;                  sad16    = sad16_sse2;
279                  dev16    = dev16_sse2;                  dev16    = dev16_sse2;
280    
# Line 278  Line 298 
298            sad16bi = sad16bi_ia64;            sad16bi = sad16bi_ia64;
299            sad8 = sad8_ia64;            sad8 = sad8_ia64;
300            dev16 = dev16_ia64;            dev16 = dev16_ia64;
301              Halfpel8_Refine = Halfpel8_Refine_ia64;
302            quant_intra = quant_intra_ia64;            quant_intra = quant_intra_ia64;
303            dequant_intra = dequant_intra_ia64;            dequant_intra = dequant_intra_ia64;
304            quant_inter = quant_inter_ia64;            quant_inter = quant_inter_ia64;
# Line 306  Line 327 
327  #endif  #endif
328  #endif  #endif
329    
         /* Inform the client the API version */  
         init_param->api_version = API_VERSION;  
   
         /* Inform the client the core build - unused because we're still alpha */  
         init_param->core_build = 1000;  
   
330          return XVID_ERR_OK;          return XVID_ERR_OK;
331  }  }
332    

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.30

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