--- trunk/xvidcore/src/encoder.c	2002/04/25 19:27:49	138
+++ trunk/xvidcore/src/encoder.c	2002/06/09 13:16:26	192
@@ -1,4 +1,44 @@
-// 14.04.2002	added FrameCodeB()
+/**************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  -  Encoder main module  -
+ *
+ *  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.
+ *
+ *  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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ ***************************************************************************/
+
+/****************************************************************************
+ * 
+ *  History
+ *
+ *  08.05.2002 fix some problem in DEBUG mode;
+ *             MinChen <chenm001@163.com>
+ *  14.04.2002 added FrameCodeB()
+ *
+ *  $Id: encoder.c,v 1.39 2002-06-09 13:16:26 edgomez Exp $
+ *
+ ***************************************************************************/
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -9,6 +49,7 @@
 #include "global.h"
 #include "utils/timer.h"
 #include "image/image.h"
+#include "motion/motion.h"
 #include "bitstream/cbp.h"
 #include "utils/mbfunctions.h"
 #include "bitstream/bitstream.h"
@@ -23,9 +64,22 @@
 #define ENC_CHECK(X) if(!(X)) return XVID_ERR_FORMAT
 #define SWAP(A,B)    { void * tmp = A; A = B; B = tmp; }
 
-
-static int FrameCodeI(Encoder * pEnc, Bitstream * bs, uint32_t *pBits);
-static int FrameCodeP(Encoder * pEnc, Bitstream * bs, uint32_t *pBits, bool force_inter, bool vol_header);
+static int FrameCodeI(Encoder * pEnc,
+		      Bitstream * bs,
+		      uint32_t *pBits);
+
+static int FrameCodeP(Encoder * pEnc,
+		      Bitstream * bs,
+		      uint32_t *pBits,
+		      bool force_inter,
+		      bool vol_header);
+
+#ifdef BFRAMES
+static void FrameCodeB(Encoder * pEnc,
+		       FRAMEINFO * frame,
+		       Bitstream * bs,
+		       uint32_t *pBits);
+#endif
 
 static int DQtab[4] = 
 {
@@ -58,14 +112,18 @@
 	ENC_CHECK(!(pParam->width % 2));
 	ENC_CHECK(!(pParam->height % 2));
 
+	/* Fps */
+
 	if (pParam->fincr <= 0 || pParam->fbase <= 0)
 	{
 		pParam->fincr = 1;
 		pParam->fbase = 25;
 	}
 
-	// simplify the "fincr/fbase" fraction
-	// (neccessary, since windows supplies us with huge numbers)
+	/*
+	 * Simplify the "fincr/fbase" fraction
+	 * (neccessary, since windows supplies us with huge numbers)
+	 */
 
 	i = pParam->fincr;
 	while (i > 1)
@@ -87,6 +145,8 @@
 		pParam->fincr = (int)(pParam->fincr / div);
 	}
 
+	/* Bitrate allocator defaults */
+
 	if (pParam->rc_bitrate <= 0)
 		pParam->rc_bitrate = 900000;
 
@@ -99,19 +159,25 @@
 	if (pParam->rc_buffer <= 0)
 		pParam->rc_buffer = 100;
 
+	/* Max and min quantizers */
+
 	if ((pParam->min_quantizer <= 0) || (pParam->min_quantizer > 31))
 		pParam->min_quantizer = 1;
 
 	if ((pParam->max_quantizer <= 0) || (pParam->max_quantizer > 31))
 		pParam->max_quantizer = 31;
 
-	if (pParam->max_key_interval == 0)		/* 1 keyframe each 10 seconds */ 
-		pParam->max_key_interval = 10 * pParam->fincr / pParam->fbase;
-					
 	if (pParam->max_quantizer < pParam->min_quantizer)
 		pParam->max_quantizer = pParam->min_quantizer;
 
-	if ((pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE)) == NULL)
+	/* 1 keyframe each 10 seconds */ 
+
+	if (pParam->max_key_interval == 0)
+		pParam->max_key_interval = 10 * pParam->fincr / pParam->fbase;
+					
+
+	pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE);
+	if (pEnc == NULL)
 		return XVID_ERR_MEMORY;
 
 	/* Fill members of Encoder structure */
@@ -122,8 +188,11 @@
 	pEnc->mbParam.mb_width = (pEnc->mbParam.width + 15) / 16;
 	pEnc->mbParam.mb_height = (pEnc->mbParam.height + 15) / 16;
 
-	pEnc->mbParam.edged_width = 16 * pEnc->mbParam.mb_width + 2 * EDGE_SIZE;
-	pEnc->mbParam.edged_height = 16 * pEnc->mbParam.mb_height + 2 * EDGE_SIZE;
+	pEnc->mbParam.edged_width  = 16*pEnc->mbParam.mb_width  + 2*EDGE_SIZE;
+	pEnc->mbParam.edged_height = 16*pEnc->mbParam.mb_height + 2*EDGE_SIZE;
+
+	pEnc->mbParam.fbase = pParam->fbase;
+	pEnc->mbParam.fincr = pParam->fincr;
 
 	pEnc->sStat.fMvPrevSigma = -1;
 
@@ -136,41 +205,36 @@
 
 	/* try to allocate frame memory */
 
-	pEnc->current = NULL;
-	pEnc->reference = NULL;
-	if ( (pEnc->current = xvid_malloc(sizeof(FRAMEINFO), CACHE_LINE)) == NULL ||
-		 (pEnc->reference = xvid_malloc(sizeof(FRAMEINFO), CACHE_LINE)) == NULL)
-	{
-		if (pEnc->current) xvid_free(pEnc->current);
-		xvid_free(pEnc);
-		return XVID_ERR_MEMORY;
-	}
+	pEnc->current = xvid_malloc(sizeof(FRAMEINFO), CACHE_LINE);
+	pEnc->reference = xvid_malloc(sizeof(FRAMEINFO), CACHE_LINE);
 
-	/* try to allocate mb memory */
+	if ( pEnc->current == NULL || pEnc->reference == NULL)
+		goto xvid_err_memory1;
 
-	pEnc->current->mbs = NULL;
-	pEnc->reference->mbs = NULL;
+	/* try to allocate mb memory */
 
-#ifdef _DEBUG
-#ifdef WIN32
-OutputDebugString("malloc mbs");
-#endif
-#endif 
+	pEnc->current->mbs = xvid_malloc(sizeof(MACROBLOCK) * \
+					 pEnc->mbParam.mb_width * \
+					 pEnc->mbParam.mb_height,
+					 CACHE_LINE);
+	pEnc->reference->mbs = xvid_malloc(sizeof(MACROBLOCK) * \
+					   pEnc->mbParam.mb_width * \
+					   pEnc->mbParam.mb_height,
+					   CACHE_LINE);
 
-	if ((pEnc->current->mbs = xvid_malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height, CACHE_LINE)) == NULL ||
-		(pEnc->reference->mbs = xvid_malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height, CACHE_LINE)) == NULL)
-	{
-		if (pEnc->current->mbs) xvid_free(pEnc->current->mbs);
-		xvid_free(pEnc->current);
-		xvid_free(pEnc->reference);
-		xvid_free(pEnc);
-	}
+	if (pEnc->current->mbs == NULL || pEnc->reference->mbs == NULL)
+		goto xvid_err_memory2;
 
 	/* try to allocate image memory */
 
 #ifdef _DEBUG
 	image_null(&pEnc->sOriginal);
 #endif
+#ifdef BFRAMES
+	image_null(&pEnc->f_refh);
+	image_null(&pEnc->f_refv);
+	image_null(&pEnc->f_refhv);
+#endif
 	image_null(&pEnc->current->image);
 	image_null(&pEnc->reference->image);
 	image_null(&pEnc->vInterH);
@@ -178,70 +242,281 @@
 	image_null(&pEnc->vInterVf);
 	image_null(&pEnc->vInterHV);
 	image_null(&pEnc->vInterHVf);
-	
+
 #ifdef _DEBUG
-#ifdef WIN32
-OutputDebugString("malloc images");
-#endif
+	if (image_create(&pEnc->sOriginal,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
 #endif
-	if (
-#ifdef _DEBUG
-		image_create(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
+#ifdef BFRAMES
+	if (image_create(&pEnc->f_refh,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
+	if (image_create(&pEnc->f_refv,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
+	if (image_create(&pEnc->f_refhv,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
 #endif
-		image_create(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
-		image_create(&pEnc->reference->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
-		image_create(&pEnc->vInterH, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
-		image_create(&pEnc->vInterV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
-		image_create(&pEnc->vInterVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
-		image_create(&pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
-		image_create(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0)
+	if (image_create(&pEnc->current->image,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
+	if (image_create(&pEnc->reference->image,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
+	if (image_create(&pEnc->vInterH,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
+	if (image_create(&pEnc->vInterV,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
+	if (image_create(&pEnc->vInterVf,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
+	if (image_create(&pEnc->vInterHV,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
+	if (image_create(&pEnc->vInterHVf,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
+
+
+
+	/* B Frames specific init */
+#ifdef BFRAMES
+	
+	pEnc->mbParam.max_bframes = pParam->max_bframes;
+	pEnc->bquant_ratio = pParam->bquant_ratio;
+	pEnc->bframes = NULL;
+
+	if (pEnc->mbParam.max_bframes > 0)
 	{
-#ifdef _DEBUG
-		image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-#endif
-		image_destroy(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->reference->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->vInterH, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->vInterVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-
-		xvid_free(pEnc->current);
-		xvid_free(pEnc->reference);
-		xvid_free(pEnc);
-		return XVID_ERR_MEMORY;
+		int n;
+
+		pEnc->bframes = xvid_malloc(pEnc->mbParam.max_bframes * \
+					    sizeof(FRAMEINFO *),
+					    CACHE_LINE);
+
+		if (pEnc->bframes == NULL)
+			goto xvid_err_memory3;
+
+		for (n=0; n<pEnc->mbParam.max_bframes; n++)
+			pEnc->bframes[n] = NULL;
+			
+
+		for (n = 0; n < pEnc->mbParam.max_bframes; n++)
+		{
+			pEnc->bframes[n] = xvid_malloc(sizeof(FRAMEINFO),
+						       CACHE_LINE);
+
+			if (pEnc->bframes[n] == NULL)
+				goto xvid_err_memory4;
+
+			pEnc->bframes[n]->mbs = xvid_malloc(sizeof(MACROBLOCK) * \
+							    pEnc->mbParam.mb_width * \
+							    pEnc->mbParam.mb_height,
+							    CACHE_LINE);
+
+			if (pEnc->bframes[n]->mbs == NULL)
+				goto xvid_err_memory4;
+
+			image_null(&pEnc->bframes[n]->image);
+
+			if (image_create(&pEnc->bframes[n]->image,
+					 pEnc->mbParam.edged_width,
+					 pEnc->mbParam.edged_height) < 0)
+				goto xvid_err_memory4;
+
+		}
 	}
 
+	pEnc->bframenum_head = 0;
+	pEnc->bframenum_tail = 0;
+	pEnc->flush_bframes = 0;
+
+	pEnc->mbParam.m_seconds = 0;
+	pEnc->mbParam.m_ticks = 0;
+#endif
+
 	pParam->handle = (void *)pEnc;
 
 	if (pParam->rc_bitrate)
 	{
-		RateControlInit(pParam->rc_bitrate, pParam->rc_reaction_delay_factor,
-			pParam->rc_averaging_period, pParam->rc_buffer, pParam->fbase * 1000 / pParam->fincr,
-			pParam->max_quantizer, pParam->min_quantizer);
+		RateControlInit(&pEnc->rate_control,
+				pParam->rc_bitrate,
+				pParam->rc_reaction_delay_factor,
+				pParam->rc_averaging_period,
+				pParam->rc_buffer,
+				pParam->fbase * 1000 / pParam->fincr,
+				pParam->max_quantizer,
+				pParam->min_quantizer);
 	}
 
 	init_timer();
 
 	return XVID_ERR_OK;
-}
 
+	/*
+	 * We handle all XVID_ERR_MEMORY here, this makes the code lighter
+	 *
+	 * ToDo?: We could avoid that piece of code if encoder_destroy could
+	 *        handle different destroy levels
+	 */
+#ifdef BFRAMES
+ xvid_err_memory4:
+	for (i=0; i<pEnc->mbParam.max_bframes; i++)
+	{
+
+		if (pEnc->bframes[i] == NULL) continue;
+
+		image_destroy(&pEnc->bframes[i]->image,
+			      pEnc->mbParam.edged_width,
+			      pEnc->mbParam.edged_height);
+
+		xvid_free(pEnc->bframes[i]->mbs);
+
+		xvid_free(pEnc->bframes[i]);
+
+	}
+
+	xvid_free(pEnc->bframes);
+
+#endif
+
+ xvid_err_memory3:
+#ifdef _DEBUG
+	image_destroy(&pEnc->sOriginal,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+#endif
+
+#ifdef BFRAMES
+	image_destroy(&pEnc->f_refh,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->f_refv,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->f_refhv,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+#endif
+
+	image_destroy(&pEnc->current->image,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->reference->image,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterH,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterV,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterVf,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterHV,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterHVf,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+
+ xvid_err_memory2:
+	xvid_free(pEnc->current->mbs);
+	xvid_free(pEnc->reference->mbs);
+
+ xvid_err_memory1:
+	xvid_free(pEnc->current);
+	xvid_free(pEnc->reference);
+	xvid_free(pEnc);
+
+	return XVID_ERR_MEMORY;
+}
 
 int encoder_destroy(Encoder * pEnc)
 {
 	ENC_CHECK(pEnc);
 
-	image_destroy(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-	image_destroy(&pEnc->reference->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-	image_destroy(&pEnc->vInterH, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-	image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-	image_destroy(&pEnc->vInterVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-	image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-	image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+	/* B Frames specific */
+#ifdef BFRAMES
+	int i;
+
+	for (i=0; i<pEnc->mbParam.max_bframes; i++)
+	{
+
+		if (pEnc->bframes[i] == NULL) continue;
+
+		image_destroy(&pEnc->bframes[i]->image,
+			      pEnc->mbParam.edged_width,
+			      pEnc->mbParam.edged_height);
+
+		xvid_free(pEnc->bframes[i]->mbs);
+
+		xvid_free(pEnc->bframes[i]);
+
+	}
+
+	xvid_free(pEnc->bframes);
+
+#endif
+
+	/* All images, reference, current etc ... */
+
+	image_destroy(&pEnc->current->image,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->reference->image,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterH,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterV,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterVf,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterHV,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterHVf,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+#ifdef BFRAMES
+	image_destroy(&pEnc->f_refh,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->f_refv,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->f_refhv,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
+#endif
 #ifdef _DEBUG
-		image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->sOriginal,
+		      pEnc->mbParam.edged_width,
+		      pEnc->mbParam.edged_height);
 #endif
+
+	/* Encoder structure */
+	
 	xvid_free(pEnc->current->mbs);
 	xvid_free(pEnc->current);
 
@@ -249,9 +524,251 @@
 	xvid_free(pEnc->reference);
 
 	xvid_free(pEnc);
+
 	return XVID_ERR_OK;
 }
 
+
+
+// ==================================================================
+#ifdef BFRAMES
+int encoder_encode(Encoder * pEnc, XVID_ENC_FRAME * pFrame, XVID_ENC_STATS * pResult)
+{
+	uint16_t x, y;
+	Bitstream bs;
+	uint32_t bits;
+
+#ifdef _DEBUG
+	float psnr;
+	char temp[128];
+#endif
+
+	ENC_CHECK(pEnc);
+	ENC_CHECK(pFrame);
+
+	start_global_timer();
+	
+	BitstreamInit(&bs, pFrame->bitstream, 0);
+
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+// bframe "flush" code
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    
+	if ((pFrame->image == NULL || pEnc->flush_bframes) && 
+		pEnc->bframenum_head < pEnc->bframenum_tail)
+	{
+
+		if (pEnc->flush_bframes == 0)	
+		{
+			// we have reached end of stream without getting a future reference
+			// .. so encode last final frame a pframe
+			//dprintf("--- PFRAME (final frame correction) --- ");
+			pEnc->bframenum_tail--;
+			SWAP(pEnc->current, pEnc->reference);
+
+			SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]);
+
+			FrameCodeP(pEnc, &bs, &bits, 1, 0);
+
+			BitstreamPad(&bs);
+			pFrame->length = BitstreamLength(&bs);
+			pFrame->input_consumed = 0;
+			pFrame->intra = 0;
+			return XVID_ERR_OK;
+		}
+
+		//dprintf("--- BFRAME (flush) --- ");
+		FrameCodeB(pEnc, 
+			pEnc->bframes[pEnc->bframenum_head],
+			 &bs, &bits);
+		pEnc->bframenum_head++;
+
+
+		BitstreamPad(&bs);
+		pFrame->length = BitstreamLength(&bs);
+		pFrame->input_consumed = 0;
+		pFrame->intra = 0;
+		return XVID_ERR_OK;
+	}
+
+	if (pFrame->image == NULL)
+	{
+		pFrame->length = 0;
+		pFrame->input_consumed = 1;
+		pFrame->intra = 0;
+		return XVID_ERR_OK;
+	}
+
+	if (pEnc->bframenum_head > 0)
+	{
+		pEnc->bframenum_head = pEnc->bframenum_tail = 0;
+	}
+
+	pEnc->flush_bframes = 0;
+
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%	
+
+	SWAP(pEnc->current, pEnc->reference);
+
+	pEnc->current->quant = (pFrame->quant == 0) ? RateControlGetQ(&pEnc->rate_control, 0) : pFrame->quant;
+	
+	if(pEnc->current->quant < 1)
+		pEnc->current->quant = 1;
+	
+	if(pEnc->current->quant > 31)
+		pEnc->current->quant = 31;
+
+	pEnc->current->global_flags = pFrame->general;
+	pEnc->current->motion_flags = pFrame->motion;
+	pEnc->current->seconds = pEnc->mbParam.m_seconds;
+	pEnc->current->ticks = pEnc->mbParam.m_ticks;
+	//@@@ TODO: dyanmic fcode (in both directions)
+	pEnc->current->fcode = pEnc->mbParam.m_fcode;
+	pEnc->current->bcode = pEnc->mbParam.m_fcode; 
+
+	start_timer();
+	if (image_input(&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width,
+			pFrame->image, pFrame->colorspace))
+	{
+		return XVID_ERR_FORMAT;
+	}
+	stop_conv_timer();
+
+#ifdef _DEBUG
+	image_copy(&pEnc->sOriginal, &pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height);
+#endif
+
+
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+// lumi masking
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+	if ((pEnc->current->global_flags & XVID_LUMIMASKING))
+	{
+		int * temp_dquants = (int *) xvid_malloc(pEnc->mbParam.mb_width * pEnc->mbParam.mb_height * sizeof(int), CACHE_LINE);
+		
+		pEnc->current->quant = adaptive_quantization(pEnc->current->image.y,
+							    pEnc->mbParam.edged_width,	// stride
+							    temp_dquants,
+							    pEnc->current->quant,
+							    pEnc->current->quant,	// min_quant
+							    2*pEnc->current->quant,	// max_quant
+							    pEnc->mbParam.mb_width,
+							    pEnc->mbParam.mb_height);
+			
+		for (y = 0; y < pEnc->mbParam.mb_height; y++)
+			for (x = 0; x < pEnc->mbParam.mb_width; x++)
+			{
+				MACROBLOCK *pMB = &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width];
+				pMB->dquant = iDQtab[(temp_dquants[y * pEnc->mbParam.mb_width + x] + 2)];
+			}
+		xvid_free(temp_dquants);
+	}
+
+
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+// ivop/pvop/bvop selection
+// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+	if (pEnc->iFrameNum == 0 || 
+		pFrame->intra == 1 ||
+		(pFrame->intra < 0 && (pEnc->iMaxKeyInterval > 0 && pEnc->iFrameNum >= pEnc->iMaxKeyInterval)) ||
+		image_mad(&pEnc->reference->image, &pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.width, pEnc->mbParam.height) > 30)
+	{
+		//dprintf("--- IFRAME ---");
+
+		FrameCodeI(pEnc, &bs, &bits);
+
+		pFrame->intra = 1;
+		pEnc->flush_bframes = 1;
+
+		/* note: sequences like "IIBB" decode fine with msfdam but,
+		   go screwy with divx5.00 */
+	}
+	else if (pEnc->bframenum_tail >= pEnc->mbParam.max_bframes)
+	{
+		//dprintf("--- PFRAME ---");
+
+		FrameCodeP(pEnc, &bs, &bits, 1, 0);
+		pFrame->intra = 0;
+		pEnc->flush_bframes = 1;
+	}
+	else
+	{
+		//dprintf("--- BFRAME (store) ---  head=%i tail=%i", pEnc->bframenum_head, pEnc->bframenum_tail);
+
+		if (pFrame->bquant < 1)
+		{
+			pEnc->current->quant = ((pEnc->reference->quant + pEnc->current->quant) * pEnc->bquant_ratio) / 200;
+		}
+		else
+		{
+			pEnc->current->quant = pFrame->bquant;
+		}
+		
+		// store frame into bframe buffer & swap ref back to current
+		SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]);
+		SWAP(pEnc->current, pEnc->reference);
+
+		pEnc->bframenum_tail++;
+
+		pFrame->intra = 0;
+		pFrame->length = 0;
+		pFrame->input_consumed = 1;
+
+		pEnc->mbParam.m_ticks += pEnc->mbParam.fincr;
+		if (pEnc->mbParam.m_ticks > pEnc->mbParam.fbase)
+		{
+			pEnc->mbParam.m_seconds++;
+			pEnc->mbParam.m_ticks = 0;
+		}
+		return XVID_ERR_OK;
+	}
+
+	BitstreamPad(&bs);
+	pFrame->length = BitstreamLength(&bs);
+
+	if (pResult)
+	{
+		pResult->quant = pEnc->current->quant;
+		pResult->hlength = pFrame->length - (pEnc->sStat.iTextBits / 8);
+		pResult->kblks = pEnc->sStat.kblks;
+		pResult->mblks = pEnc->sStat.mblks;
+		pResult->ublks = pEnc->sStat.ublks;
+	}
+
+#ifdef _DEBUG
+	psnr = image_psnr(&pEnc->sOriginal, &pEnc->current->image, pEnc->mbParam.edged_width,
+				pEnc->mbParam.width, pEnc->mbParam.height);
+
+	sprintf(temp, "PSNR: %f\n", psnr);
+	DEBUG(temp);
+#endif
+
+	if (pFrame->quant == 0)
+	{
+		RateControlUpdate(&pEnc->rate_control,
+				  pEnc->current->quant,
+				  pFrame->length,
+				  pFrame->intra);
+	}
+
+	pEnc->iFrameNum++;
+	pEnc->mbParam.m_ticks += pEnc->mbParam.fincr;
+	if (pEnc->mbParam.m_ticks > pEnc->mbParam.fbase)
+	{
+		pEnc->mbParam.m_seconds++;
+		pEnc->mbParam.m_ticks = 0;
+	}
+	pFrame->input_consumed = 1;
+	
+	stop_global_timer();
+	write_timer();
+
+	return XVID_ERR_OK;
+}
+// ==================================================================
+#else
 int encoder_encode(Encoder * pEnc, XVID_ENC_FRAME * pFrame, XVID_ENC_STATS * pResult)
 {
 	uint16_t x, y;
@@ -285,7 +802,7 @@
 	stop_conv_timer();
 
 #ifdef _DEBUG
-	image_copy(&pEnc->sOriginal, &pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.height);
+        image_copy(&pEnc->sOriginal, &pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height);
 #endif
 
 	EMMS();
@@ -294,7 +811,7 @@
 
 	if (pFrame->quant == 0)
 	{
-		pEnc->current->quant = RateControlGetQ(0);
+		pEnc->current->quant = RateControlGetQ(&pEnc->rate_control,0);
 	}
 	else
 	{
@@ -387,7 +904,10 @@
 
 	if (pFrame->quant == 0)
 	{
-		RateControlUpdate(pEnc->current->quant, pFrame->length, pFrame->intra);
+		RateControlUpdate(&pEnc->rate_control,
+				  pEnc->current->quant,
+				  pFrame->length,
+				  pFrame->intra);
 	}
 
 #ifdef _DEBUG
@@ -405,6 +925,7 @@
 
 	return XVID_ERR_OK;
 }
+#endif
 
 
 static __inline void CodeIntraMB(Encoder *pEnc, MACROBLOCK *pMB) {
@@ -472,7 +993,7 @@
 			MVBLOCKHINT * bhint = &hint->mvhint.block[x + y * pEnc->mbParam.mb_width];
 			VECTOR pred[4];
 			VECTOR tmp;
-			int dummy[4];
+			int32_t dummy[4];
 			int vec;
 
 			pMB->mode = (hint->rawhints) ? bhint->mode : BitstreamGetBits(&bs, MODEBITS);
@@ -716,9 +1237,9 @@
 	int iLimit;
 	uint32_t x, y;
 	int iSearchRange;
-	bool bIntra;
+	int bIntra;
 
-	IMAGE *pCurrent = &pEnc->current->image;
+	/* IMAGE *pCurrent = &pEnc->current->image; */
 	IMAGE *pRef = &pEnc->reference->image;
 
 	start_timer();
@@ -893,12 +1414,11 @@
 }
 
 
-
-/*
+#ifdef BFRAMES
 static void FrameCodeB(Encoder * pEnc, FRAMEINFO * frame, Bitstream * bs, uint32_t *pBits)
 {
-    int16_t dct_codes[6][64];
-    int16_t qcoeff[6][64];
+    int16_t dct_codes[6*64];
+    int16_t qcoeff[6*64];
     uint32_t x, y;
 	VECTOR forward;
 	VECTOR backward;
@@ -907,14 +1427,14 @@
 	IMAGE *b_ref = &pEnc->current->image;
 
 	// forward 
-	image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height);
+	image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height, frame->global_flags & XVID_INTERLACING);
 	start_timer();
 	image_interpolate(f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv,
 		pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, 0);
 	stop_inter_timer();
 
 	// backward
-	image_setedges(b_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height);
+	image_setedges(b_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height, frame->global_flags & XVID_INTERLACING);
     start_timer();
 	image_interpolate(b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
 		pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, 0);
@@ -924,17 +1444,17 @@
 	MotionEstimationBVOP(&pEnc->mbParam, frame, 
 		pEnc->reference->mbs, f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv,
 		pEnc->current->mbs, b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV);
+		
 
 	stop_motion_timer();
 	
-	if (test_quant_type(&pEnc->mbParam, pEnc->current))
+	/*if (test_quant_type(&pEnc->mbParam, pEnc->current))
 	{
 		BitstreamWriteVolHeader(bs, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.quant_type);
-	}
+	}*/
 
     frame->coding_type = B_VOP;
-    BitstreamWriteVopHeader(bs, B_VOP, frame->tick, 0,
-			frame->quant, frame->fcode, frame->bcode);
+    BitstreamWriteVopHeader(bs, &pEnc->mbParam, frame);
 
     *pBits = BitstreamPos(bs);
 
@@ -973,7 +1493,7 @@
 					dct_codes);
 	
 			mb->quant = frame->quant;
-			mb->cbp = MBTransQuantInter(&pEnc->mbParam, frame, x, y, dct_codes, qcoeff);
+			mb->cbp = MBTransQuantInter(&pEnc->mbParam, frame, mb, x, y, dct_codes, qcoeff);
 			//mb->cbp = MBTransQuantBVOP(&pEnc->mbParam, x, y, dct_codes, qcoeff, &frame->image, frame->quant);
 
 
@@ -1004,7 +1524,7 @@
 //			printf("[%i %i] M=%i CBP=%i MVX=%i MVY=%i %i,%i  %i,%i\n", x, y, pMB->mode, pMB->cbp, pMB->mvs[0].x, bmb->pmvs[0].x, bmb->pmvs[0].y, forward.x, forward.y);
 
 			start_timer();			
-			MBCodingBVOP(frame, mb, qcoeff, bs, &pEnc->sStat);
+			MBCodingBVOP(mb, qcoeff, frame->fcode, frame->bcode, bs, &pEnc->sStat);
 			stop_coding_timer();
 		}
 	}
@@ -1014,7 +1534,5 @@
 	// TODO: dynamic fcode/bcode ???
 
 	*pBits = BitstreamPos(bs) - *pBits;
-
 }
-
-*/
+#endif