--- encoder.h	2002/12/04 12:31:18	1.18.2.6
+++ encoder.h	2002/09/04 21:03:29	1.20
@@ -3,6 +3,8 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Encoder header -
  *
+ *  Copyright(C) 2002 Michael Militzer
+ *
  *  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
@@ -27,18 +29,6 @@
  *  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.18.2.6 2002/12/04 12:31:18 suxen_drol Exp $
- *
- ****************************************************************************/
 
 #ifndef _ENCODER_H_
 #define _ENCODER_H_
@@ -70,8 +60,7 @@
 {
 	I_VOP = 0,
 	P_VOP = 1,
-	B_VOP = 2,
-	S_VOP = 3
+	B_VOP = 2
 }
 VOP_TYPE;
 
@@ -97,8 +86,6 @@
 	int num_threads;
 #endif
 
-	int max_bframes;
-
 	/* rounding type; alternate 0-1 after each interframe */
 	/* 1 <= fixed_code <= 4
 	   automatically adjusted using motion vector statistics inside
@@ -108,25 +95,14 @@
 	uint32_t m_quant_type;
 	uint32_t m_rounding_type;
 	uint32_t m_fcode;
-	uint32_t m_quarterpel;
 
 	HINTINFO *hint;
 
-	int64_t m_stamp;
-}
-MBParam;
-
+	uint32_t m_seconds;
+	uint32_t m_ticks;
 
-typedef struct
-{
-	int iTextBits;
-	int iMvSum;
-	int iMvCount;
-	int kblks;
-	int mblks;
-	int ublks;
 }
-Statistics;
+MBParam;
 
 
 typedef struct
@@ -137,23 +113,31 @@
 
 	VOP_TYPE coding_type;
 	uint32_t rounding_type;
-	uint32_t quarterpel;
 	uint32_t fcode;
 	uint32_t bcode;
 
 	uint32_t seconds;
 	uint32_t ticks;
-	int64_t stamp;
 
 	IMAGE image;
 
 	MACROBLOCK *mbs;
-	VECTOR GMC_MV;
 
-	Statistics sStat;
 }
 FRAMEINFO;
 
+typedef struct
+{
+	int iTextBits;
+	float fMvPrevSigma;
+	int iMvSum;
+	int iMvCount;
+	int kblks;
+	int mblks;
+	int ublks;
+}
+Statistics;
+
 
 
 typedef struct
@@ -178,34 +162,8 @@
 	IMAGE vInterHV;
 	IMAGE vInterHVf;
 
-	/* constants */
-	int global;
-	int bquant_ratio;
-	int bquant_offset;
-	int frame_drop_ratio;
-
-	/* image queue */
-	int queue_head;
-	int queue_tail;
-	int queue_size;
-	IMAGE *queue;
-
-	/* bframe buffer */
-	int bframenum_head;
-	int bframenum_tail;
-	int flush_bframes;
-
-	FRAMEINFO **bframes;
-	IMAGE f_refh;
-	IMAGE f_refv;
-	IMAGE f_refhv;
-	int bframenum_dx50bvop;
-
-	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
-
+	Statistics sStat;
 	RateControl rate_control;
-
-	float fMvPrevSigma;
 }
 Encoder;