[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.17, Thu Jun 13 21:35:01 2002 UTC revision 1.23, Wed Jun 26 15:59:51 2002 UTC
# Line 31  Line 31 
31   *   *
32   *  History   *  History
33   *   *
34     *      - 23.06.2002    added XVID_CPU_CHKONLY
35   *  - 17.03.2002        Added interpolate8x8_halfpel_hv_xmm   *  - 17.03.2002        Added interpolate8x8_halfpel_hv_xmm
36   *  - 22.12.2001  API change: added xvid_init() - Isibaar   *  - 22.12.2001  API change: added xvid_init() - Isibaar
37   *  - 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 80  Line 81 
81    
82          init_param = (XVID_INIT_PARAM *) param1;          init_param = (XVID_INIT_PARAM *) param1;
83    
84            /* Inform the client the API version */
85            init_param->api_version = API_VERSION;
86    
87            /* Inform the client the core build - unused because we're still alpha */
88            init_param->core_build = 1000;
89    
90            if ((init_param->cpu_flags & XVID_CPU_CHKONLY))
91            {
92                    init_param->cpu_flags = check_cpu_features();
93                    return XVID_ERR_OK;
94            }
95    
96          /* Do we have to force CPU features  ? */          /* Do we have to force CPU features  ? */
97          if ((init_param->cpu_flags & XVID_CPU_FORCE) > 0) {          if ((init_param->cpu_flags & XVID_CPU_FORCE) > 0) {
98                  cpu_flags = init_param->cpu_flags;                  cpu_flags = init_param->cpu_flags;
99          } else {          } else {
100    
 #ifdef ARCH_X86  
101                  cpu_flags = check_cpu_features();                  cpu_flags = check_cpu_features();
 #else  
                 cpu_flags = 0;  
 #endif  
102                  init_param->cpu_flags = cpu_flags;                  init_param->cpu_flags = cpu_flags;
103          }          }
104    
# Line 184  Line 193 
193                  transfer_8to16copy = transfer_8to16copy_mmx;                  transfer_8to16copy = transfer_8to16copy_mmx;
194                  transfer_16to8copy = transfer_16to8copy_mmx;                  transfer_16to8copy = transfer_16to8copy_mmx;
195                  transfer_8to16sub  = transfer_8to16sub_mmx;                  transfer_8to16sub  = transfer_8to16sub_mmx;
196                    transfer_8to16sub2 = transfer_8to16sub2_mmx;
197                  transfer_16to8add  = transfer_16to8add_mmx;                  transfer_16to8add  = transfer_16to8add_mmx;
198                  transfer8x8_copy   = transfer8x8_copy_mmx;                  transfer8x8_copy   = transfer8x8_copy_mmx;
199    
200    
201                  /* Image Interpolation related functions */                  /* Image Interpolation related functions */
202                  interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_mmx;                  interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_mmx;
203                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;
# Line 223  Line 234 
234                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;
235                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;
236    
237                    /* Buffer transfer */
238                    transfer_8to16sub2 = transfer_8to16sub2_xmm;
239    
240                  /* Colorspace transformation */                  /* Colorspace transformation */
241                  yuv_to_yv12 = yuv_to_yv12_xmm;                  yuv_to_yv12 = yuv_to_yv12_xmm;
242    
# Line 263  Line 277 
277    
278  #endif  #endif
279    
280    #ifdef ARCH_IA64
281            if ((cpu_flags & XVID_CPU_IA64) > 0) { //use assembler routines?
282              idct_ia64_init();
283              fdct = fdct_ia64;
284              idct = idct_ia64;   //not yet working, crashes
285              interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_ia64;
286              interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_ia64;
287              interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_ia64;
288              sad16 = sad16_ia64;
289              sad16bi = sad16bi_ia64;
290              sad8 = sad8_ia64;
291              dev16 = dev16_ia64;
292              quant_intra = quant_intra_ia64;
293              dequant_intra = dequant_intra_ia64;
294              quant_inter = quant_inter_ia64;
295              dequant_inter = dequant_inter_ia64;
296              transfer_8to16copy = transfer_8to16copy_ia64;
297              transfer_16to8copy = transfer_16to8copy_ia64;
298              transfer_8to16sub = transfer_8to16sub_ia64;
299              transfer_8to16sub2 = transfer_8to16sub2_ia64;
300              transfer_16to8add = transfer_16to8add_ia64;
301              transfer8x8_copy = transfer8x8_copy_ia64;
302              DEBUG("Using IA-64 assembler routines.\n");
303            }
304    #endif
305    
306  #ifdef ARCH_PPC  #ifdef ARCH_PPC
307  #ifdef ARCH_PPC_ALTIVEC  #ifdef ARCH_PPC_ALTIVEC
308          calc_cbp = calc_cbp_altivec;          calc_cbp = calc_cbp_altivec;
# Line 277  Line 317 
317  #endif  #endif
318  #endif  #endif
319    
         /* 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;  
   
320          return XVID_ERR_OK;          return XVID_ERR_OK;
321  }  }
322    
# Line 336  Line 370 
370  {  {
371          switch (opt) {          switch (opt) {
372          case XVID_ENC_ENCODE:          case XVID_ENC_ENCODE:
373    #ifdef BFRAMES
374                    if (((Encoder *) handle)->mbParam.max_bframes >= 0)
375                    return encoder_encode_bframes((Encoder *) handle, (XVID_ENC_FRAME *) param1,
376                                                              (XVID_ENC_STATS *) param2);
377                    else
378    #endif
379                  return encoder_encode((Encoder *) handle, (XVID_ENC_FRAME *) param1,                  return encoder_encode((Encoder *) handle, (XVID_ENC_FRAME *) param1,
380                                                            (XVID_ENC_STATS *) param2);                                                            (XVID_ENC_STATS *) param2);
381    

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.23

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