--- trunk/xvidcore/src/encoder.h	2002/06/13 21:45:24	202
+++ trunk/xvidcore/src/encoder.h	2002/09/04 20:56:52	399
@@ -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.10 2002-06-13 21:45:24 edgomez Exp $
- *
- ****************************************************************************/
 
 #ifndef _ENCODER_H_
 #define _ENCODER_H_
@@ -92,6 +82,10 @@
 	uint32_t fincr;
 	uint32_t fbase;
 
+#ifdef _SMP
+	int num_threads;
+#endif
+
 #ifdef BFRAMES
 	int max_bframes;
 #endif
@@ -108,10 +102,8 @@
 
 	HINTINFO *hint;
 
-#ifdef BFRAMES
 	uint32_t m_seconds;
 	uint32_t m_ticks;
-#endif
 
 }
 MBParam;
@@ -128,10 +120,8 @@
 	uint32_t fcode;
 	uint32_t bcode;
 
-#ifdef BFRAMES
 	uint32_t seconds;
 	uint32_t ticks;
-#endif
 
 	IMAGE image;
 
@@ -167,7 +157,7 @@
 	FRAMEINFO *current;
 	FRAMEINFO *reference;
 
-#ifdef _DEBUG
+#ifdef _DEBUG_PSNR
 	IMAGE sOriginal;
 #endif
 	IMAGE vInterH;
@@ -178,8 +168,17 @@
 
 #ifdef BFRAMES
 	/* constants */
+	int global;
 	int bquant_ratio;
-	/* vars */
+	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;
@@ -188,7 +187,14 @@
 	IMAGE f_refh;
 	IMAGE f_refv;
 	IMAGE f_refhv;
+	int bframenum_dx50bvop;
+
+	int last_pframe; 	
+	int last_sync; 	
+	int time_pp;
+	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
 #endif
+
 	Statistics sStat;
 	RateControl rate_control;
 }
@@ -239,4 +245,8 @@
 				   XVID_ENC_FRAME * pFrame,
 				   XVID_ENC_STATS * pResult);
 
+int encoder_encode_bframes(Encoder * pEnc,
+				   XVID_ENC_FRAME * pFrame,
+				   XVID_ENC_STATS * pResult);
+
 #endif