[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.33.2.6, Sat Oct 5 21:33:39 2002 UTC revision 1.36, Wed Sep 4 22:08:45 2002 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-2002 Peter Ross <pross@cs.rmit.edu.au>
7     *
8   *  This program is an implementation of a part of one or more MPEG-4   *  This program is an implementation of a part of one or more MPEG-4
9   *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending   *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
10   *  to use this software module in hardware or software products are   *  to use this software module in hardware or software products are
# Line 26  Line 28 
28   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
29   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
30   *   *
  ****************************************************************************/  
   
 /*****************************************************************************  
  *  
  *  History  
  *  
  *      - 23.06.2002    added XVID_CPU_CHKONLY  
  *  - 17.03.2002        Added interpolate8x8_halfpel_hv_xmm  
  *  - 22.12.2001  API change: added xvid_init() - Isibaar  
  *  - 16.12.2001        inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>  
  *  
31   *  $Id$   *  $Id$
32   *   *
33   ****************************************************************************/   ****************************************************************************/
# Line 50  Line 41 
41  #include "image/colorspace.h"  #include "image/colorspace.h"
42  #include "image/interpolate8x8.h"  #include "image/interpolate8x8.h"
43  #include "utils/mem_transfer.h"  #include "utils/mem_transfer.h"
 #include "utils/mbfunctions.h"  
44  #include "quant/quant_h263.h"  #include "quant/quant_h263.h"
45  #include "quant/quant_mpeg4.h"  #include "quant/quant_mpeg4.h"
46  #include "motion/motion.h"  #include "motion/motion.h"
# Line 82  Line 72 
72    
73    
74  /*  /*
75  calls the funcptr, and returns whether SIGILL (illegal instruction) was signalled   * Calls the funcptr, and returns whether SIGILL (illegal instruction) was signalled
76  return values:   * Return values:
77  -1 : could not determine   * -1 : could not determine
78  0  : SIGILL was *not* signalled   * 0  : SIGILL was *not* signalled
79  1  : SIGILL was signalled   * 1  : SIGILL was signalled
80  */  */
81    
82  int  int
# Line 217  Line 207 
207          transfer_16to8add  = transfer_16to8add_c;          transfer_16to8add  = transfer_16to8add_c;
208          transfer8x8_copy   = transfer8x8_copy_c;          transfer8x8_copy   = transfer8x8_copy_c;
209    
         /* Interlacing functions */  
         MBFieldTest = MBFieldTest_c;  
   
210          /* Image interpolation related functions */          /* Image interpolation related functions */
211          interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_c;          interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_c;
212          interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_c;          interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_c;
213          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c;          interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c;
214    
         interpolate8x8_lowpass_h = interpolate8x8_lowpass_h_c;  
         interpolate8x8_lowpass_v = interpolate8x8_lowpass_v_c;  
         interpolate8x8_lowpass_hv = interpolate8x8_lowpass_hv_c;  
   
         interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_c;  
         interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_c;  
   
         interpolate8x8_avg2 = interpolate8x8_avg2_c;  
         interpolate8x8_avg4 = interpolate8x8_avg4_c;  
   
215          /* Initialize internal colorspace transformation tables */          /* Initialize internal colorspace transformation tables */
216          colorspace_init();          colorspace_init();
217    
# Line 263  Line 240 
240          sad16bi  = sad16bi_c;          sad16bi  = sad16bi_c;
241          sad8bi   = sad8bi_c;          sad8bi   = sad8bi_c;
242          dev16    = dev16_c;          dev16    = dev16_c;
         sad16v   = sad16v_c;  
243    
244  //      Halfpel8_Refine = Halfpel8_Refine_c;          Halfpel8_Refine = Halfpel8_Refine_c;
245    
246  #ifdef ARCH_X86  #ifdef ARCH_X86
247          if ((cpu_flags & XVID_CPU_MMX) > 0) {          if ((cpu_flags & XVID_CPU_MMX) > 0) {
# Line 296  Line 272 
272                  transfer_16to8add  = transfer_16to8add_mmx;                  transfer_16to8add  = transfer_16to8add_mmx;
273                  transfer8x8_copy   = transfer8x8_copy_mmx;                  transfer8x8_copy   = transfer8x8_copy_mmx;
274    
                 /* Interlacing Functions */  
                 MBFieldTest = MBFieldTest_mmx;  
275    
276                  /* Image Interpolation related functions */                  /* Image Interpolation related functions */
277                  interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_mmx;                  interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_mmx;
278                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;                  interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;
279                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx;                  interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx;
280    
                 interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_mmx;  
                 interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_mmx;  
   
                 interpolate8x8_avg2 = interpolate8x8_avg2_mmx;  
                 interpolate8x8_avg4 = interpolate8x8_avg4_mmx;  
   
281                  /* Image RGB->YV12 related functions */                  /* Image RGB->YV12 related functions */
282                  rgb24_to_yv12 = rgb24_to_yv12_mmx;                  rgb24_to_yv12 = rgb24_to_yv12_mmx;
283                  rgb32_to_yv12 = rgb32_to_yv12_mmx;                  rgb32_to_yv12 = rgb32_to_yv12_mmx;
# Line 330  Line 298 
298                  sad16bi = sad16bi_mmx;                  sad16bi = sad16bi_mmx;
299                  sad8bi  = sad8bi_mmx;                  sad8bi  = sad8bi_mmx;
300                  dev16    = dev16_mmx;                  dev16    = dev16_mmx;
                 sad16v   = sad16v_mmx;  
301    
302          }          }
303    
# Line 369  Line 336 
336                  sad16bi = sad16bi_xmm;                  sad16bi = sad16bi_xmm;
337                  sad8bi  = sad8bi_xmm;                  sad8bi  = sad8bi_xmm;
338                  dev16 = dev16_xmm;                  dev16 = dev16_xmm;
                 sad16v   = sad16v_xmm;  
                 fprintf(stderr,"sad16v=XMM\n");  
339    
340          }          }
341    
# Line 417  Line 382 
382            sad16bi = sad16bi_ia64;            sad16bi = sad16bi_ia64;
383            sad8 = sad8_ia64;            sad8 = sad8_ia64;
384            dev16 = dev16_ia64;            dev16 = dev16_ia64;
385  //        Halfpel8_Refine = Halfpel8_Refine_ia64;            Halfpel8_Refine = Halfpel8_Refine_ia64;
386            quant_intra = quant_intra_ia64;            quant_intra = quant_intra_ia64;
387            dequant_intra = dequant_intra_ia64;            dequant_intra = dequant_intra_ia64;
388            quant_inter = quant_inter_ia64;            quant_inter = quant_inter_ia64;
# Line 499  Line 464 
464  {  {
465          switch (opt) {          switch (opt) {
466          case XVID_ENC_ENCODE:          case XVID_ENC_ENCODE:
 #ifdef BFRAMES  
                 if (((Encoder *) handle)->mbParam.max_bframes >= 0)  
                 return encoder_encode_bframes((Encoder *) handle, (XVID_ENC_FRAME *) param1,  
                                                           (XVID_ENC_STATS *) param2);  
                 else  
 #endif  
467                  return encoder_encode((Encoder *) handle, (XVID_ENC_FRAME *) param1,                  return encoder_encode((Encoder *) handle, (XVID_ENC_FRAME *) param1,
468                                                            (XVID_ENC_STATS *) param2);                                                            (XVID_ENC_STATS *) param2);
469    
Legend:
Removed from v.1.33.2.6  
changed lines
  Added in v.1.36
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4