--- encoder.h	2002/06/13 21:45:24	1.10
+++ encoder.h	2002/09/28 13:01:15	1.18.2.1
@@ -36,7 +36,7 @@
  *               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 $
+ *  $Id: encoder.h,v 1.18.2.1 2002/09/28 13:01:15 chl Exp $
  *
  ****************************************************************************/
 
@@ -92,6 +92,10 @@
 	uint32_t fincr;
 	uint32_t fbase;
 
+#ifdef _SMP
+	int num_threads;
+#endif
+
 #ifdef BFRAMES
 	int max_bframes;
 #endif
@@ -108,11 +112,7 @@
 
 	HINTINFO *hint;
 
-#ifdef BFRAMES
-	uint32_t m_seconds;
-	uint32_t m_ticks;
-#endif
-
+	int64_t m_stamp;
 }
 MBParam;
 
@@ -128,10 +128,9 @@
 	uint32_t fcode;
 	uint32_t bcode;
 
-#ifdef BFRAMES
 	uint32_t seconds;
 	uint32_t ticks;
-#endif
+	uint64_t stamp;
 
 	IMAGE image;
 
@@ -167,7 +166,7 @@
 	FRAMEINFO *current;
 	FRAMEINFO *reference;
 
-#ifdef _DEBUG
+#ifdef _DEBUG_PSNR
 	IMAGE sOriginal;
 #endif
 	IMAGE vInterH;
@@ -178,8 +177,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 +196,11 @@
 	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 */
 #endif
+
 	Statistics sStat;
 	RateControl rate_control;
 }
@@ -239,4 +251,8 @@
 				   XVID_ENC_FRAME * pFrame,
 				   XVID_ENC_STATS * pResult);
 
+int encoder_encode_bframes(Encoder * pEnc,
+				   XVID_ENC_FRAME * pFrame,
+				   XVID_ENC_STATS * pResult);
+
 #endif