--- encoder.h 2003/06/09 01:16:35 1.27.2.9 +++ encoder.h 2003/08/26 14:07:11 1.27.2.14 @@ -1,16 +1,10 @@ /***************************************************************************** * * XVID MPEG-4 VIDEO CODEC - * - Encoder header - + * - Encoder related header - * - * This program is an implementation of a part of one or more MPEG-4 - * Video tools as specified in ISO/IEC 14496-2 standard. Those intending - * to use this software module in hardware or software products are - * advised that its use may infringe existing patents or copyrights, and - * any such use would be at such party's own risk. The original - * developer of this software module and his/her company, and subsequent - * editors and their companies, will have no liability for use of this - * software or modifications or derivatives thereof. + * Copyright(C) 2002-2003 Michael Militzer + * 2002-2003 Peter Ross * * This program is free software ; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,17 +20,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ****************************************************************************/ -/***************************************************************************** - * - * History - * - * - 13.06.2002 Added legal header - * - 22.08.2001 Added support for EXT_MODE encoding mode - * support for EXTENDED API - * - 22.08.2001 fixed bug in iDQtab - * - * $Id: encoder.h,v 1.27.2.9 2003/06/09 01:16:35 edgomez Exp $ + * $Id: encoder.h,v 1.27.2.14 2003/08/26 14:07:11 edgomez Exp $ * ****************************************************************************/ @@ -75,12 +59,12 @@ int plugin_flags; /* frame rate increment & base */ - uint32_t fincr; + int32_t fincr; uint32_t fbase; int profile; - xvid_global_t global_flags; + int global_flags; int bquant_ratio; int bquant_offset; int frame_drop_ratio; @@ -88,6 +72,10 @@ int min_quant[3]; int max_quant[3]; + int par; + int par_width; + int par_height; + #ifdef _SMP int num_threads; #endif @@ -105,7 +93,7 @@ /* vars that not "quite" frame independant */ uint32_t m_rounding_type; uint32_t m_fcode; - xvid_vol_t vol_flags; + int vol_flags; int64_t m_stamp; } @@ -139,9 +127,9 @@ { int frame_num; int fincr; - xvid_vol_t vol_flags; - xvid_vop_t vop_flags; - xvid_motion_t motion_flags; + int vol_flags; + int vop_flags; + int motion_flags; int coding_type; uint32_t quant; @@ -159,6 +147,7 @@ WARPPOINTS warp; /* as in bitstream */ GMC_DATA gmc_data; /* common data for all MBs */ + NEW_GMC_DATA new_gmc_data; /* common data for all MBs */ int length; /* the encoded size of this frame */ @@ -179,7 +168,7 @@ xvid_enc_zone_t * zones; /* plugins */ - unsigned int num_plugins; /* note: we store plugin flags in MBPARAM */ + int num_plugins; /* note: we store plugin flags in MBPARAM */ xvid_enc_plugin_t * plugins; /* dquant */