--- encoder.c	2002/04/17 14:05:54	1.26
+++ encoder.c	2002/06/09 23:30:50	1.40
@@ -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.40 2002/06/09 23:30:50 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"
@@ -20,24 +61,75 @@
 #include "quant/quant_matrix.h"
 #include "utils/mem_align.h"
 
+/*****************************************************************************
+ * Local macros
+ ****************************************************************************/
+
 #define ENC_CHECK(X) if(!(X)) return XVID_ERR_FORMAT
+#define SWAP(A,B)    { void * tmp = A; A = B; B = tmp; }
 
+/*****************************************************************************
+ * Local function prototypes
+ ****************************************************************************/
+
+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 FrameCodeI(Encoder * pEnc, Bitstream * bs, uint32_t *pBits);
-static int FrameCodeP(Encoder * pEnc, Bitstream * bs, uint32_t *pBits, bool force_inter, bool vol_header);
+/*****************************************************************************
+ * Local data
+ ****************************************************************************/
 
-static int DQtab[4] = 
+static int DQtab[4] =
 {
 	-1, -2, 1, 2
 };
 
-static int iDQtab[5] = 
+static int iDQtab[5] =
 {
 	1, 0, NO_CHANGE, 2, 3
 };
 
 
-int encoder_create(XVID_ENC_PARAM * pParam)
+static void __inline image_null(IMAGE * image)
+{
+	image->y = image->u = image->v = NULL;
+}
+
+
+/*****************************************************************************
+ * Encoder creation
+ *
+ * This function creates an Encoder instance, it allocates all necessary
+ * image buffers (reference, current and bframes) and initialize the internal
+ * xvid encoder paremeters according to the XVID_ENC_PARAM input parameter.
+ *
+ * The code seems to be very long but is very basic, mainly memory allocation
+ * and cleaning code.
+ *
+ * Returned values :
+ *    - XVID_ERR_OK     - no errors
+ *    - XVID_ERR_MEMORY - the libc could not allocate memory, the function
+ *                        cleans the structure before exiting.
+ *                        pParam->handle is also set to NULL.
+ *
+ ****************************************************************************/
+
+int
+encoder_create(XVID_ENC_PARAM * pParam)
 {
 	Encoder *pEnc;
 	uint32_t i;
@@ -51,14 +143,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)
@@ -80,6 +176,8 @@
 		pParam->fincr = (int)(pParam->fincr / div);
 	}
 
+	/* Bitrate allocator defaults */
+
 	if (pParam->rc_bitrate <= 0)
 		pParam->rc_bitrate = 900000;
 
@@ -92,19 +190,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 */
@@ -115,105 +219,706 @@
 	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;
 
 	/* Fill rate control parameters */
 
-	pEnc->mbParam.quant = 4;
-
 	pEnc->bitrate = pParam->rc_bitrate;
 
 	pEnc->iFrameNum = 0;
 	pEnc->iMaxKeyInterval = pParam->max_key_interval;
 
-	/* try to allocate memory */
+	/* try to allocate frame memory */
+
+	pEnc->current = xvid_malloc(sizeof(FRAMEINFO), CACHE_LINE);
+	pEnc->reference = xvid_malloc(sizeof(FRAMEINFO), CACHE_LINE);
+
+	if ( pEnc->current == NULL || pEnc->reference == NULL)
+		goto xvid_err_memory1;
+
+	/* try to allocate mb memory */
+
+	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 == NULL || pEnc->reference->mbs == NULL)
+		goto xvid_err_memory2;
+
+	/* try to allocate image memory */
 
-	pEnc->sCurrent.y	=	pEnc->sCurrent.u	=	pEnc->sCurrent.v	= NULL;
-	pEnc->sReference.y	=	pEnc->sReference.u	=	pEnc->sReference.v	= NULL;
-	pEnc->vInterH.y		=	pEnc->vInterH.u		=	pEnc->vInterH.v		= NULL;
-	pEnc->vInterV.y		=	pEnc->vInterV.u		=	pEnc->vInterV.v		= NULL;
-	pEnc->vInterVf.y	=	pEnc->vInterVf.u	=	pEnc->vInterVf.v	= NULL;
-	pEnc->vInterHV.y	=	pEnc->vInterHV.u	=	pEnc->vInterHV.v	= NULL;
-	pEnc->vInterHVf.y	=	pEnc->vInterHVf.u	=	pEnc->vInterHVf.v	= NULL;
-
-	pEnc->pMBs = NULL;
-
-	if (image_create(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
-		image_create(&pEnc->sReference, 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 ||
 #ifdef _DEBUG
-		image_create(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
+	image_null(&pEnc->sOriginal);
 #endif
-		(pEnc->pMBs = xvid_malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height, CACHE_LINE)) == NULL)
-	{
-		image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->sReference, 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_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);
+	image_null(&pEnc->vInterV);
+	image_null(&pEnc->vInterVf);
+	image_null(&pEnc->vInterHV);
+	image_null(&pEnc->vInterHVf);
+
 #ifdef _DEBUG
-		image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+	if (image_create(&pEnc->sOriginal,
+			 pEnc->mbParam.edged_width,
+			 pEnc->mbParam.edged_height) < 0)
+		goto xvid_err_memory3;
+#endif
+#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
-		if (pEnc)
+	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)
+	{
+		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++)
 		{
-			xvid_free(pEnc);
+			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;
+
 		}
-		return XVID_ERR_MEMORY;
 	}
 
-	// init macroblock array
-	for (i = 0; i < pEnc->mbParam.mb_width * pEnc->mbParam.mb_height; i++)
-	{
-		pEnc->pMBs[i].dquant = NO_CHANGE;
-	}
+	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
+	 */
+#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);
+
+	pParam->handle = NULL;
+
+	return XVID_ERR_MEMORY;
 }
 
+/*****************************************************************************
+ * Encoder destruction
+ *
+ * This function destroy the entire encoder structure created by a previous
+ * successful encoder_create call.
+ *
+ * Returned values (for now only one returned value) :
+ *    - XVID_ERR_OK     - no errors
+ *
+ ****************************************************************************/
 
-int encoder_destroy(Encoder * pEnc)
+int
+encoder_destroy(Encoder * pEnc)
 {
 	ENC_CHECK(pEnc);
-	ENC_CHECK(pEnc->sCurrent.y);
-	ENC_CHECK(pEnc->sReference.y);
 
-	xvid_free(pEnc->pMBs);
-	image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-	image_destroy(&pEnc->sReference, 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);
+
+	xvid_free(pEnc->reference->mbs);
+	xvid_free(pEnc->reference);
+
 	xvid_free(pEnc);
 
 	return XVID_ERR_OK;
 }
 
-int encoder_encode(Encoder * pEnc, XVID_ENC_FRAME * pFrame, XVID_ENC_STATS * pResult)
+/*****************************************************************************
+ * Frame encoder entry point
+ *
+ * At this moment 2 versions coexist : one for IPB compatible encoder,
+ *                                     another one for the old IP encoder.
+ *
+ * Returned values :
+ *    - XVID_ERR_OK     - no errors
+ *    - XVID_ERR_FORMAT - the image subsystem reported the image had a wrong
+ *                        format
+ ****************************************************************************/
+
+
+#ifdef BFRAMES
+/*****************************************************************************
+ * Frame encoder entry point for IPB capable encoder
+ ****************************************************************************/
+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 the end of stream without getting
+			 * a future reference frame... so encode last final
+			 * frame as a pframe
+			 */
+
+			/* ToDo : remove dprintf calls */
+			/*
+			  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;
+		}
+
+		/* ToDo : remove dprintf calls */
+		/*
+		  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;
+
+	/* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+	 * Well there was a separation here so i put it in ANSI C
+	 * comment style :-)
+	 * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */
+
+	SWAP(pEnc->current, pEnc->reference);
+
+	EMMS();
+
+	if (pFrame->quant == 0)
+		pEnc->current->quant = RateControlGetQ(&pEnc->rate_control, 0);
+	else
+		pEnc->current->quant = 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 : dynamic 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
+
+	EMMS();
+
+	/* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+	 * Luminance 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,
+					      temp_dquants,
+					      pEnc->current->quant,
+					      pEnc->current->quant,
+					      2*pEnc->current->quant,
+					      pEnc->mbParam.mb_width,
+					      pEnc->mbParam.mb_height);
+			
+		for (y = 0; y < pEnc->mbParam.mb_height; y++)
+		{
+
+			#define OFFSET(x,y) ((x) + (y)*pEnc->mbParam.mb_width)
+
+			for (x = 0; x < pEnc->mbParam.mb_width; x++)
+			{
+				MACROBLOCK *pMB =
+					&pEnc->current->mbs[OFFSET(x,y)];
+				pMB->dquant =
+					iDQtab[temp_dquants[OFFSET(x,y)] + 2];
+			}
+
+			#undef OFFSET
+
+		}
+
+		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)
+	{
+		/*
+		 * This will be coded as an Intra Frame
+		 */
+
+		/* ToDo : Remove dprintf calls */
+		/*
+		  dprintf("--- IFRAME ---");
+		*/
+
+		FrameCodeI(pEnc, &bs, &bits);
+
+		pFrame->intra = 1;
+		pEnc->flush_bframes = 1;
+
+		/*
+		 * NB : sequences like "IIBB" decode fine with msfdam but,
+		 *      go screwy with divx 5.00
+		 */
+	}
+	else if (pEnc->bframenum_tail >= pEnc->mbParam.max_bframes)
+	{
+		/*
+		 * This will be coded as a Predicted Frame
+		 */
+
+		/* ToDo : Remove dprintf calls */
+		/*
+		  dprintf("--- PFRAME ---");
+		*/
+
+		FrameCodeP(pEnc, &bs, &bits, 1, 0);
+		pFrame->intra = 0;
+		pEnc->flush_bframes = 1;
+	}
+	else
+	{
+		/*
+		 * This will be coded as a Bidirectional Frame
+		 */
+
+		/* ToDo : Remove dprintf calls */
+		/*
+		  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;
+	}
+
+	EMMS();
+
+#ifdef _DEBUG
+	psnr = image_psnr(&pEnc->sOriginal,
+			  &pEnc->current->image,
+			  pEnc->mbParam.edged_width,
+			  pEnc->mbParam.width,
+			  pEnc->mbParam.height);
+
+	snprintf(temp, 127, "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
+/*****************************************************************************
+ * Frame encoder entry point for IP capable encoder
+ ****************************************************************************/
+int
+encoder_encode(Encoder * pEnc,
+	       XVID_ENC_FRAME * pFrame,
+	       XVID_ENC_STATS * pResult)
 {
 	uint16_t x, y;
 	Bitstream bs;
@@ -221,7 +926,7 @@
 	uint16_t write_vol_header = 0;
 #ifdef _DEBUG
 	float psnr;
-	uint8_t temp[100];
+	uint8_t temp[128];
 #endif
 
 	start_global_timer();
@@ -231,101 +936,151 @@
 	ENC_CHECK(pFrame->bitstream);
 	ENC_CHECK(pFrame->image);
 
-	pEnc->mbParam.global_flags = pFrame->general;
-	pEnc->mbParam.motion_flags = pFrame->motion;
+	SWAP(pEnc->current, pEnc->reference);
+
+	pEnc->current->global_flags = pFrame->general;
+	pEnc->current->motion_flags = pFrame->motion;
 	pEnc->mbParam.hint = &pFrame->hint;
 
 	start_timer();
-	if (image_input(&pEnc->sCurrent, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width,
-			pFrame->image, pFrame->colorspace))
-	{
+	if (image_input(&pEnc->current->image,
+			pEnc->mbParam.width,
+			pEnc->mbParam.height,
+			pEnc->mbParam.edged_width,
+			pFrame->image,
+			pFrame->colorspace) < 0)
 		return XVID_ERR_FORMAT;
-	}
 	stop_conv_timer();
 
-	EMMS();
-
 #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();
+
 	BitstreamInit(&bs, pFrame->bitstream, 0);
 
 	if (pFrame->quant == 0)
 	{
-		pEnc->mbParam.quant = RateControlGetQ(0);
+		pEnc->current->quant = RateControlGetQ(&pEnc->rate_control,0);
 	}
 	else
 	{
-		pEnc->mbParam.quant = pFrame->quant;
+		pEnc->current->quant = pFrame->quant;
 	}
 
-	if ((pEnc->mbParam.global_flags & XVID_LUMIMASKING) > 0)
+	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);
+		int * temp_dquants = (int *)
+			xvid_malloc(pEnc->mbParam.mb_width * \
+				    pEnc->mbParam.mb_height * \
+				    sizeof(int),
+				    CACHE_LINE);
 		
-		pEnc->mbParam.quant = adaptive_quantization(pEnc->sCurrent.y,
-							    pEnc->mbParam.width,
-							    temp_dquants,
-							    pEnc->mbParam.quant,
-							    pEnc->mbParam.quant,
-							    2*pEnc->mbParam.quant,
-							    pEnc->mbParam.mb_width,
-							    pEnc->mbParam.mb_height);
+		pEnc->current->quant =
+			adaptive_quantization(pEnc->current->image.y,
+					      pEnc->mbParam.edged_width,
+					      temp_dquants,
+					      pEnc->current->quant,
+					      pEnc->current->quant,
+					      2*pEnc->current->quant,
+					      pEnc->mbParam.mb_width,
+					      pEnc->mbParam.mb_height);
 			
 		for (y = 0; y < pEnc->mbParam.mb_height; y++)
+		{
+
+			#define OFFSET(x,y) ((x) + (y)*pEnc->mbParam.mb_width)
+
 			for (x = 0; x < pEnc->mbParam.mb_width; x++)
 			{
-				MACROBLOCK *pMB = &pEnc->pMBs[x + y * pEnc->mbParam.mb_width];
-				pMB->dquant = iDQtab[(temp_dquants[y * pEnc->mbParam.mb_width + x] + 2)];
+
+
+				MACROBLOCK *pMB =
+					&pEnc->current->mbs[OFFSET(x,y)];
+				pMB->dquant =
+					iDQtab[temp_dquants[OFFSET(x,y)] + 2];
 			}
+
+			#undef OFFSET
+		}
+
 		xvid_free(temp_dquants);
 	}
 
-	if(pEnc->mbParam.global_flags & XVID_H263QUANT) {
-		if(pEnc->mbParam.quant_type != H263_QUANT)
+	if (pEnc->current->global_flags & XVID_H263QUANT)
+	{
+		if(pEnc->mbParam.m_quant_type != H263_QUANT)
 			write_vol_header = 1;
-		pEnc->mbParam.quant_type = H263_QUANT;
+		pEnc->mbParam.m_quant_type = H263_QUANT;
 	}
-	else if(pEnc->mbParam.global_flags & XVID_MPEGQUANT) {
-		int ret1, ret2;
+	else if (pEnc->current->global_flags & XVID_MPEGQUANT)
+	{
+		int matrix1_changed, matrix2_changed;
 
-		ret1 = ret2 = 0;
+		matrix1_changed = matrix2_changed = 0;
 
-		if(pEnc->mbParam.quant_type != MPEG4_QUANT)
+		if(pEnc->mbParam.m_quant_type != MPEG4_QUANT)
 			write_vol_header = 1;
 		
-		pEnc->mbParam.quant_type = MPEG4_QUANT;
+		pEnc->mbParam.m_quant_type = MPEG4_QUANT;
 		
-		if ((pEnc->mbParam.global_flags & XVID_CUSTOM_QMATRIX) > 0) {
+		if ((pEnc->current->global_flags & XVID_CUSTOM_QMATRIX) > 0) {
 			if(pFrame->quant_intra_matrix != NULL)
-				ret1 = set_intra_matrix(pFrame->quant_intra_matrix);
+				matrix1_changed =
+					set_intra_matrix(pFrame->quant_intra_matrix);
 			if(pFrame->quant_inter_matrix != NULL)
-				ret2 = set_inter_matrix(pFrame->quant_inter_matrix);
+				matrix2_changed
+					= set_inter_matrix(pFrame->quant_inter_matrix);
 		}
 		else {
-			ret1 = set_intra_matrix(get_default_intra_matrix());
-			ret2 = set_inter_matrix(get_default_inter_matrix());
+			matrix1_changed = set_intra_matrix(get_default_intra_matrix());
+			matrix2_changed = set_inter_matrix(get_default_inter_matrix());
 		}
 		if(write_vol_header == 0)
-			write_vol_header = ret1 | ret2;
+			write_vol_header = matrix1_changed | matrix2_changed;
 	}
 
 	if (pFrame->intra < 0)
 	{
-		if ((pEnc->iFrameNum == 0) || ((pEnc->iMaxKeyInterval > 0) 
-					       && (pEnc->iFrameNum >= pEnc->iMaxKeyInterval)))
+		if ((pEnc->iFrameNum == 0) ||
 
-			pFrame->intra = FrameCodeI(pEnc, &bs, &bits);
+		    ((pEnc->iMaxKeyInterval > 0) &&
+		     (pEnc->iFrameNum >= pEnc->iMaxKeyInterval)))
+		{
+			pFrame->intra = FrameCodeI(pEnc,
+						   &bs,
+						   &bits);
+		}
 		else
-			pFrame->intra = FrameCodeP(pEnc, &bs, &bits, 0, write_vol_header);
+		{
+			pFrame->intra =	FrameCodeP(pEnc,
+						   &bs,
+						   &bits,
+						   0,
+						   write_vol_header);
+		}
 	}
 	else
 	{
 		if (pFrame->intra == 1)
-			pFrame->intra = FrameCodeI(pEnc, &bs, &bits);
+		{
+			pFrame->intra = FrameCodeI(pEnc,
+						   &bs,
+						   &bits);
+		}
 		else
-			pFrame->intra = FrameCodeP(pEnc, &bs, &bits, 1, write_vol_header);
+		{
+			pFrame->intra = FrameCodeP(pEnc,
+						   &bs,
+						   &bits,
+						   1,
+						   write_vol_header);
+		}
+
 	}
 
 	BitstreamPutBits(&bs, 0xFFFF, 16);
@@ -335,7 +1090,7 @@
 
 	if (pResult)
 	{
-		pResult->quant = pEnc->mbParam.quant;
+		pResult->quant = pEnc->current->quant;
 		pResult->hlength = pFrame->length - (pEnc->sStat.iTextBits / 8);
 		pResult->kblks = pEnc->sStat.kblks;
 		pResult->mblks = pEnc->sStat.mblks;
@@ -346,43 +1101,55 @@
 
 	if (pFrame->quant == 0)
 	{
-		RateControlUpdate(pEnc->mbParam.quant, pFrame->length, pFrame->intra);
+		RateControlUpdate(&pEnc->rate_control,
+				  pEnc->current->quant,
+				  pFrame->length,
+				  pFrame->intra);
 	}
 
 #ifdef _DEBUG
-	psnr = image_psnr(&pEnc->sOriginal, &pEnc->sCurrent, pEnc->mbParam.edged_width,
-				pEnc->mbParam.width, pEnc->mbParam.height);
+	psnr = image_psnr(&pEnc->sOriginal,
+			  &pEnc->current->image,
+			  pEnc->mbParam.edged_width,
+			  pEnc->mbParam.width,
+			  pEnc->mbParam.height);
 
-	sprintf(temp, "PSNR: %f\n", psnr);
+	snprintf(temp, 127, "PSNR: %f\n", psnr);
 	DEBUG(temp);
 #endif
 
 	pEnc->iFrameNum++;
-	image_swap(&pEnc->sCurrent, &pEnc->sReference);
 	
 	stop_global_timer();
 	write_timer();
 
 	return XVID_ERR_OK;
 }
+#endif
 
 
 static __inline void CodeIntraMB(Encoder *pEnc, MACROBLOCK *pMB) {
 
 	pMB->mode = MODE_INTRA;
 
-	if ((pEnc->mbParam.global_flags & XVID_LUMIMASKING) > 0) {
+	/* zero mv statistics */
+	pMB->mvs[0].x = pMB->mvs[1].x = pMB->mvs[2].x = pMB->mvs[3].x = 0;
+	pMB->mvs[0].y = pMB->mvs[1].y = pMB->mvs[2].y = pMB->mvs[3].y = 0;
+	pMB->sad8[0] = pMB->sad8[1] = pMB->sad8[2] = pMB->sad8[3] = 0;
+	pMB->sad16 = 0;
+
+	if ((pEnc->current->global_flags & XVID_LUMIMASKING)) {
 		if(pMB->dquant != NO_CHANGE)
 		{
 			pMB->mode = MODE_INTRA_Q;
-			pEnc->mbParam.quant += DQtab[pMB->dquant];
+			pEnc->current->quant += DQtab[pMB->dquant];
 		
-			if (pEnc->mbParam.quant > 31) pEnc->mbParam.quant = 31;
-			if (pEnc->mbParam.quant < 1) pEnc->mbParam.quant = 1;
+			if (pEnc->current->quant > 31) pEnc->current->quant = 31;
+			if (pEnc->current->quant < 1) pEnc->current->quant = 1;
 		}
 	}
 
-	pMB->quant = pEnc->mbParam.quant;
+	pMB->quant = pEnc->current->quant;
 }
 
 
@@ -413,20 +1180,20 @@
 		return;
 	}
 
-	pEnc->mbParam.fixed_code = (hint->rawhints) ? hint->mvhint.fcode : BitstreamGetBits(&bs, FCODEBITS);
+	pEnc->current->fcode = (hint->rawhints) ? hint->mvhint.fcode : BitstreamGetBits(&bs, FCODEBITS);
 
-	length	= pEnc->mbParam.fixed_code + 5;
+	length	= pEnc->current->fcode + 5;
 	high	= 1 << (length - 1);
 
 	for (y=0 ; y<pEnc->mbParam.mb_height ; ++y)
 	{
 		for (x=0 ; x<pEnc->mbParam.mb_width ; ++x)
 		{
-			MACROBLOCK * pMB = &pEnc->pMBs[x + y * pEnc->mbParam.mb_width];
+			MACROBLOCK * pMB = &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width];
 			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);
@@ -441,7 +1208,7 @@
 				tmp.x -= (tmp.x >= high) ? high*2 : 0;
 				tmp.y -= (tmp.y >= high) ? high*2 : 0;
 
-				get_pmvdata(pEnc->pMBs, x, y, pEnc->mbParam.mb_width, 0, pred, dummy);
+				get_pmvdata(pEnc->current->mbs, x, y, pEnc->mbParam.mb_width, 0, pred, dummy);
 
 				for (vec=0 ; vec<4 ; ++vec)
 				{
@@ -460,7 +1227,7 @@
 					tmp.x -= (tmp.x >= high) ? high*2 : 0;
 					tmp.y -= (tmp.y >= high) ? high*2 : 0;
 
-					get_pmvdata(pEnc->pMBs, x, y, pEnc->mbParam.mb_width, vec, pred, dummy);
+					get_pmvdata(pEnc->current->mbs, x, y, pEnc->mbParam.mb_width, vec, pred, dummy);
 
 					pMB->mvs[vec].x  = tmp.x;
 					pMB->mvs[vec].y  = tmp.y;
@@ -476,7 +1243,8 @@
 				}
 			}
 
-			if (pMB->dquant != NO_CHANGE && pMB->mode == MODE_INTER4V)
+			if (pMB->mode == MODE_INTER4V &&
+				(pEnc->current->global_flags & XVID_LUMIMASKING) && pMB->dquant != NO_CHANGE)
 			{
 				pMB->mode = MODE_INTRA;
 
@@ -519,23 +1287,23 @@
 		return;
 	}
 
-	length	= pEnc->mbParam.fixed_code + 5;
+	length	= pEnc->current->fcode + 5;
 	high	= 1 << (length - 1);
 
 	if (hint->rawhints)
 	{
-		hint->mvhint.fcode = pEnc->mbParam.fixed_code;
+		hint->mvhint.fcode = pEnc->current->fcode;
 	}
 	else
 	{
-		BitstreamPutBits(&bs, pEnc->mbParam.fixed_code, FCODEBITS);
+		BitstreamPutBits(&bs, pEnc->current->fcode, FCODEBITS);
 	}
 
 	for (y=0 ; y<pEnc->mbParam.mb_height ; ++y)
 	{
 		for (x=0 ; x<pEnc->mbParam.mb_width ; ++x)
 		{
-			MACROBLOCK * pMB = &pEnc->pMBs[x + y * pEnc->mbParam.mb_width];
+			MACROBLOCK * pMB = &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width];
 			MVBLOCKHINT * bhint = &hint->mvhint.block[x + y * pEnc->mbParam.mb_width];
 			VECTOR tmp;
 
@@ -609,11 +1377,12 @@
 	uint16_t x, y;
 
 	pEnc->iFrameNum = 0;
-	pEnc->mbParam.rounding_type = 1;
-	pEnc->mbParam.coding_type = I_VOP;
+	pEnc->mbParam.m_rounding_type = 1;
+	pEnc->current->rounding_type = pEnc->mbParam.m_rounding_type;
+	pEnc->current->coding_type = I_VOP;
 
-	BitstreamWriteVolHeader(bs, &pEnc->mbParam);
-	BitstreamWriteVopHeader(bs, &pEnc->mbParam);
+	BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current);
+	BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current);
 
 	*pBits = BitstreamPos(bs);
 
@@ -624,18 +1393,18 @@
 	for (y = 0; y < pEnc->mbParam.mb_height; y++)
 		for (x = 0; x < pEnc->mbParam.mb_width; x++)
 		{
-			MACROBLOCK *pMB = &pEnc->pMBs[x + y * pEnc->mbParam.mb_width];
+			MACROBLOCK *pMB = &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width];
 
 			CodeIntraMB(pEnc, pMB);
 
-			MBTransQuantIntra(&pEnc->mbParam, pMB, x, y, dct_codes, qcoeff, &pEnc->sCurrent);
+			MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y, dct_codes, qcoeff);
 
 			start_timer();
-			MBPrediction(&pEnc->mbParam, x, y, pEnc->mbParam.mb_width, qcoeff, pEnc->pMBs);
+			MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff);
 			stop_prediction_timer();
 
 			start_timer();
-			MBCoding(&pEnc->mbParam, pMB, qcoeff, bs, &pEnc->sStat);
+			MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat);
 			stop_coding_timer();
 		}
 
@@ -645,9 +1414,9 @@
 	pEnc->sStat.fMvPrevSigma = -1;
 	pEnc->sStat.iMvSum = 0;
 	pEnc->sStat.iMvCount = 0;
-	pEnc->mbParam.fixed_code = 2;
+	pEnc->mbParam.m_fcode = 2;
 
-	if (pEnc->mbParam.global_flags & XVID_HINTEDME_GET)
+	if (pEnc->current->global_flags & XVID_HINTEDME_GET)
 	{
 		HintedMEGet(pEnc, 1);
 	}
@@ -668,10 +1437,10 @@
 	int iLimit;
 	uint32_t x, y;
 	int iSearchRange;
-	bool bIntra;
+	int bIntra;
 
-	IMAGE *pCurrent = &pEnc->sCurrent;
-	IMAGE *pRef = &pEnc->sReference;
+	/* IMAGE *pCurrent = &pEnc->current->image; */
+	IMAGE *pRef = &pEnc->reference->image;
 
 	start_timer();
 	image_setedges(pRef,
@@ -679,34 +1448,41 @@
 		       pEnc->mbParam.edged_height,
 		       pEnc->mbParam.width,
 		       pEnc->mbParam.height,
-		       pEnc->mbParam.global_flags & XVID_INTERLACING);
+		       pEnc->current->global_flags & XVID_INTERLACING);
 	stop_edges_timer();
 
-	pEnc->mbParam.rounding_type = 1 - pEnc->mbParam.rounding_type;
+	pEnc->mbParam.m_rounding_type = 1 - pEnc->mbParam.m_rounding_type;
+	pEnc->current->rounding_type = pEnc->mbParam.m_rounding_type;
+	pEnc->current->fcode = pEnc->mbParam.m_fcode;
 
 	if (!force_inter)
 		iLimit = (int)(pEnc->mbParam.mb_width * pEnc->mbParam.mb_height * INTRA_THRESHOLD);
 	else
 		iLimit = pEnc->mbParam.mb_width * pEnc->mbParam.mb_height + 1;
 
-	if ((pEnc->mbParam.global_flags & XVID_HALFPEL) > 0) {
+	if ((pEnc->current->global_flags & XVID_HALFPEL)) {
 		start_timer();
 		image_interpolate(pRef, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
 				  pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,
-				  pEnc->mbParam.rounding_type);
+				  pEnc->current->rounding_type);
 		stop_inter_timer();
 	}
 
 	start_timer();
-	if (pEnc->mbParam.global_flags & XVID_HINTEDME_SET)
+	if (pEnc->current->global_flags & XVID_HINTEDME_SET)
 	{
 		HintedMESet(pEnc, &bIntra);
 	}
 	else
 	{
-		bIntra = MotionEstimation(pEnc->pMBs, &pEnc->mbParam, &pEnc->sReference,
-					  &pEnc->vInterH, &pEnc->vInterV,
-					  &pEnc->vInterHV, &pEnc->sCurrent, iLimit);
+		bIntra = MotionEstimation(
+			&pEnc->mbParam, 
+			pEnc->current, 
+			pEnc->reference, 
+			&pEnc->vInterH, 
+			&pEnc->vInterV,
+			&pEnc->vInterHV, 
+			iLimit);
 	}
 	stop_motion_timer();
 
@@ -715,12 +1491,12 @@
 		return FrameCodeI(pEnc, bs, pBits);
 	}
 
-	pEnc->mbParam.coding_type = P_VOP;
+	pEnc->current->coding_type = P_VOP;
 
 	if(vol_header)
-		BitstreamWriteVolHeader(bs, &pEnc->mbParam);
+		BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current);
 
-	BitstreamWriteVopHeader(bs, &pEnc->mbParam);
+	BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current);
 
 	*pBits = BitstreamPos(bs);
 
@@ -733,7 +1509,7 @@
 	{
 		for(x = 0; x < pEnc->mbParam.mb_width; x++)
 		{
-			MACROBLOCK * pMB = &pEnc->pMBs[x + y * pEnc->mbParam.mb_width];
+			MACROBLOCK * pMB = &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width];
 
 			bIntra = (pMB->mode == MODE_INTRA) || (pMB->mode == MODE_INTRA_Q);
 
@@ -742,40 +1518,40 @@
 				start_timer();
 				MBMotionCompensation(pMB,
 						     x, y,
-						     &pEnc->sReference,
+						     &pEnc->reference->image,
 						     &pEnc->vInterH,
 						     &pEnc->vInterV,
 						     &pEnc->vInterHV,
-						     &pEnc->sCurrent,
+						     &pEnc->current->image,
 						     dct_codes,
 						     pEnc->mbParam.width,
 						     pEnc->mbParam.height,
 						     pEnc->mbParam.edged_width,
-						     pEnc->mbParam.rounding_type);
+						     pEnc->current->rounding_type);
 				stop_comp_timer();
 
-				if ((pEnc->mbParam.global_flags & XVID_LUMIMASKING) > 0) {
+				if ((pEnc->current->global_flags & XVID_LUMIMASKING)) {
 					if(pMB->dquant != NO_CHANGE) {
 						pMB->mode = MODE_INTER_Q;
-						pEnc->mbParam.quant += DQtab[pMB->dquant];
-						if (pEnc->mbParam.quant > 31) pEnc->mbParam.quant = 31;
-						else if(pEnc->mbParam.quant < 1) pEnc->mbParam.quant = 1;
+						pEnc->current->quant += DQtab[pMB->dquant];
+						if (pEnc->current->quant > 31) pEnc->current->quant = 31;
+						else if(pEnc->current->quant < 1) pEnc->current->quant = 1;
 					}
 				}
-				pMB->quant = pEnc->mbParam.quant;
+				pMB->quant = pEnc->current->quant;
 
 				pMB->field_pred = 0;
 
-				pMB->cbp = MBTransQuantInter(&pEnc->mbParam, pMB, x, y, dct_codes, qcoeff, pCurrent);
+				pMB->cbp = MBTransQuantInter(&pEnc->mbParam, pEnc->current, pMB, x, y, dct_codes, qcoeff);
 			}
 			else 
 			{
 				CodeIntraMB(pEnc, pMB);
-				MBTransQuantIntra(&pEnc->mbParam, pMB, x, y, dct_codes, qcoeff, pCurrent);
+				MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y, dct_codes, qcoeff);
 			}
 
 			start_timer();
-			MBPrediction(&pEnc->mbParam, x, y, pEnc->mbParam.mb_width, qcoeff, pEnc->pMBs);
+			MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff);			
 			stop_prediction_timer();
 
 			if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q)
@@ -796,14 +1572,14 @@
 			}
 
 			start_timer();
-			MBCoding(&pEnc->mbParam, pMB, qcoeff, bs, &pEnc->sStat);
+			MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat);
 			stop_coding_timer();
 		}
 	}
 
 	emms();
 
-	if (pEnc->mbParam.global_flags & XVID_HINTEDME_GET)
+	if (pEnc->current->global_flags & XVID_HINTEDME_GET)
 	{
 		HintedMEGet(pEnc, 0);
 	}
@@ -813,20 +1589,20 @@
 
 	fSigma = (float)sqrt((float) pEnc->sStat.iMvSum / pEnc->sStat.iMvCount);
 
-	iSearchRange = 1 << (3 + pEnc->mbParam.fixed_code);
+	iSearchRange = 1 << (3 + pEnc->mbParam.m_fcode);
 
 	if ((fSigma > iSearchRange / 3) 
-	    && (pEnc->mbParam.fixed_code <= 3))	// maximum search range 128
+	    && (pEnc->mbParam.m_fcode <= 3))	// maximum search range 128
 	{
-		pEnc->mbParam.fixed_code++;
+		pEnc->mbParam.m_fcode++;
 		iSearchRange *= 2;
 	}
 	else if ((fSigma < iSearchRange / 6)
 		 && (pEnc->sStat.fMvPrevSigma >= 0)
 		 && (pEnc->sStat.fMvPrevSigma < iSearchRange / 6)
-		 && (pEnc->mbParam.fixed_code >= 2))	// minimum search range 16
+		 && (pEnc->mbParam.m_fcode >= 2))	// minimum search range 16
 	{
-		pEnc->mbParam.fixed_code--;
+		pEnc->mbParam.m_fcode--;
 		iSearchRange /= 2;
 	}
 
@@ -838,12 +1614,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;
@@ -852,14 +1627,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);
@@ -869,17 +1644,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);
 
@@ -918,7 +1693,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);
 
 
@@ -949,7 +1724,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();
 		}
 	}
@@ -959,7 +1734,5 @@
 	// TODO: dynamic fcode/bcode ???
 
 	*pBits = BitstreamPos(bs) - *pBits;
-
 }
-
-*/
\ No newline at end of file
+#endif