[svn] / branches / dev-api-4 / xvidcore / src / divx4.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/divx4.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

trunk/xvidcore/src/divx4.c revision 499, Sat Sep 21 03:11:36 2002 UTC branches/dev-api-4/xvidcore/src/divx4.c revision 949, Wed Mar 26 14:56:49 2003 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - OpenDivx API wrapper -   *  - OpenDivx API wrapper -
5   *   *
  *  Copyright(C) 2001-2002 Peter Ross <pross@xvid.org>  
  *  
6   *  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
7   *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending   *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
8   *  to use this software module in hardware or software products are   *  to use this software module in hardware or software products are
# Line 30  Line 28 
28   *   *
29   *************************************************************************/   *************************************************************************/
30    
31    /**************************************************************************
32     *
33     *  History:
34     *
35     *      24.02.2002      #def BFRAMES compatibility
36     *  26.02.2001  fixed dec_csp bugs
37     *  26.12.2001  xvid_init() support
38     *  22.12.2001  removed some compiler warnings
39     *  16.12.2001  inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
40     *
41     *  $Id: divx4.c,v 1.21.2.1 2003-03-26 14:56:09 edgomez Exp $
42     *
43     *************************************************************************/
44    
45  #include <stdlib.h>  #include <stdlib.h>
46  #include <string.h>  #include <string.h>
47  #include <stdio.h>  #include <stdio.h>
# Line 94  Line 106 
106  static int const divx4_motion_presets[7] = {  static int const divx4_motion_presets[7] = {
107          0,          0,
108    
109          PMV_EARLYSTOP16,          0,
110    
111          PMV_EARLYSTOP16 | PMV_ADVANCEDDIAMOND16,          XVID_ME_ADVANCEDDIAMOND16,
112    
113          PMV_EARLYSTOP16 | PMV_HALFPELREFINE16,          XVID_ME_HALFPELREFINE16,
114    
115          PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 |          XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8,
                 PMV_HALFPELREFINE8,  
116    
117          PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 |          XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8,
                 PMV_HALFPELREFINE8,  
118    
119          PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | PMV_EARLYSTOP8 |          XVID_ME_HALFPELREFINE16 | XVID_ME_EXTSEARCH16 | XVID_ME_HALFPELREFINE8
                 PMV_HALFPELREFINE8  
120  };  };
121    
122    
# Line 116  Line 125 
125          0,          0,
126          XVID_H263QUANT,          XVID_H263QUANT,
127          XVID_H263QUANT,          XVID_H263QUANT,
128          XVID_H263QUANT | XVID_HALFPEL,          XVID_H263QUANT | XVID_VOP_HALFPEL,
129          XVID_H263QUANT | XVID_INTER4V | XVID_HALFPEL,          XVID_H263QUANT | XVID_VOP_INTER4V | XVID_VOP_HALFPEL,
130          XVID_H263QUANT | XVID_INTER4V | XVID_HALFPEL,          XVID_H263QUANT | XVID_VOP_INTER4V | XVID_VOP_HALFPEL,
131          XVID_H263QUANT | XVID_INTER4V | XVID_HALFPEL          XVID_H263QUANT | XVID_VOP_INTER4V | XVID_VOP_HALFPEL
132  };  };
133    
134  /**************************************************************************  /**************************************************************************
# Line 275  Line 284 
284                          }                          }
285    
286                          /* Decode the bitstream */                          /* Decode the bitstream */
287                          xerr = decoder_decode(dcur->handle, &dcur->xframe);                          xerr = decoder_decode(dcur->handle, &dcur->xframe, NULL);
288    
289                          /* Restore the real colorspace for this instance */                          /* Restore the real colorspace for this instance */
290                          if (!dframe->render_flag) {                          if (!dframe->render_flag) {
# Line 358  Line 367 
367                          xparam.max_quantizer = eparam->max_quantizer;                          xparam.max_quantizer = eparam->max_quantizer;
368                          xparam.max_key_interval = eparam->max_key_interval;                          xparam.max_key_interval = eparam->max_key_interval;
369    
370                            xparam.global = 0;
371                            xparam.max_bframes = -1;        /* use "original" IP-frame encoder */
372                            xparam.bquant_ratio = 200;
373                            xparam.frame_drop_ratio = 0;    /* dont drop frames */
374    
375                          /* Create the encoder session */                          /* Create the encoder session */
376                          xerr = encoder_create(&xparam);                          xerr = encoder_create(&xparam);
377    

Legend:
Removed from v.499  
changed lines
  Added in v.949

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