[cvs] / xvidcore / src / divx4.c Repository:
ViewVC logotype

Diff of /xvidcore/src/divx4.c

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

revision 1.20, Sat Nov 16 23:38:16 2002 UTC revision 1.21, Sat Feb 15 15:22:17 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   *   *
6   *  Copyright(C) 2001-2002 Peter Ross <pross@xvid.org>   *  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
8     *  to use this software module in hardware or software products are
9     *  advised that its use may infringe existing patents or copyrights, and
10     *  any such use would be at such party's own risk.  The original
11     *  developer of this software module and his/her company, and subsequent
12     *  editors and their companies, will have no liability for use of this
13     *  software or modifications or derivatives thereof.
14   *   *
15   *  This file is part of XviD, a free MPEG-4 video encoder/decoder   *  This program is free software; you can redistribute it and/or modify
16   *   *  it under the terms of the GNU General Public License as published by
  *  XviD is free software; you can redistribute it and/or modify it  
  *  under the terms of the GNU General Public License as published by  
17   *  the Free Software Foundation; either version 2 of the License, or   *  the Free Software Foundation; either version 2 of the License, or
18   *  (at your option) any later version.   *  (at your option) any later version.
19   *   *
# Line 19  Line 24 
24   *   *
25   *  You should have received a copy of the GNU General Public License   *  You should have received a copy of the GNU General Public License
26   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
27   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
28     *
29     *************************************************************************/
30    
31    /**************************************************************************
32     *
33     *  History:
34   *   *
35   *  Under section 8 of the GNU General Public License, the copyright   *      24.02.2002      #def BFRAMES compatibility
36   *  holders of XVID explicitly forbid distribution in the following   *  26.02.2001  fixed dec_csp bugs
37   *  countries:   *  26.12.2001  xvid_init() support
38   *   *  22.12.2001  removed some compiler warnings
39   *    - Japan   *  16.12.2001  inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
  *    - United States of America  
  *  
  *  Linking XviD statically or dynamically with other modules is making a  
  *  combined work based on XviD.  Thus, the terms and conditions of the  
  *  GNU General Public License cover the whole combination.  
  *  
  *  As a special exception, the copyright holders of XviD give you  
  *  permission to link XviD with independent modules that communicate with  
  *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the  
  *  license terms of these independent modules, and to copy and distribute  
  *  the resulting combined work under terms of your choice, provided that  
  *  every copy of the combined work is accompanied by a complete copy of  
  *  the source code of XviD (the version of XviD used to produce the  
  *  combined work), being distributed under the terms of the GNU General  
  *  Public License plus this exception.  An independent module is a module  
  *  which is not derived from or based on XviD.  
  *  
  *  Note that people who make modified versions of XviD are not obligated  
  *  to grant this special exception for their modified versions; it is  
  *  their choice whether to do so.  The GNU General Public License gives  
  *  permission to release a modified version without this exception; this  
  *  exception also makes it possible to release a modified version which  
  *  carries forward this exception.  
40   *   *
41   * $Id$   * $Id$
42   *   *
# Line 118  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,          PMV_ADVANCEDDIAMOND16,
112    
113          PMV_EARLYSTOP16 | PMV_HALFPELREFINE16,          PMV_HALFPELREFINE16,
114    
115          PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 |          PMV_HALFPELREFINE16 | PMV_HALFPELREFINE8,
                 PMV_HALFPELREFINE8,  
116    
117          PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 |          PMV_HALFPELREFINE16 | PMV_HALFPELREFINE8,
                 PMV_HALFPELREFINE8,  
118    
119          PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | PMV_EARLYSTOP8 |          PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | PMV_HALFPELREFINE8
                 PMV_HALFPELREFINE8  
120  };  };
121    
122    
# Line 299  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 382  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.1.20  
changed lines
  Added in v.1.21

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