--- branches/dev-api-3/xvidcore/src/encoder.c	2002/11/07 10:31:03	631
+++ branches/dev-api-3/xvidcore/src/encoder.c	2002/11/12 14:44:53	643
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.76.2.16 2002-11-07 10:28:15 suxen_drol Exp $
+ *  $Id: encoder.c,v 1.76.2.18 2002-11-12 14:44:53 syskin Exp $
  *
  ****************************************************************************/
 
@@ -666,6 +666,7 @@
 	uint32_t bits, mode;
 
 	int input_valid = 1;
+	int bframes_count = 0;
 
 #ifdef _DEBUG_PSNR
 	float psnr;
@@ -706,6 +707,7 @@
 			SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]);
 
 			FrameCodeP(pEnc, &bs, &bits, 1, 0);
+			bframes_count = 0;
 
 			BitstreamPad(&bs);
 			pFrame->length = BitstreamLength(&bs);
@@ -928,11 +930,10 @@
 	if (pEnc->iFrameNum == 0 || pFrame->intra == 1 || pEnc->bframenum_dx50bvop >= 0 ||
 		(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) {*/
-			2 == (mode = MEanalysis(&pEnc->reference->image, &pEnc->current->image,
-					 &pEnc->mbParam, pEnc->current->mbs, pEnc->current->fcode))) {
+		|| 2 == (mode = MEanalysis(&pEnc->reference->image, pEnc->current,
+									&pEnc->mbParam, pEnc->iMaxKeyInterval,
+									(pFrame->intra < 0) ? pEnc->iFrameNum : 0,
+									bframes_count++))) {
 
 		/*
 		 * This will be coded as an Intra Frame
@@ -958,12 +959,14 @@
 				image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 100, "DX50 BVOP->PVOP");
 			}
 			FrameCodeP(pEnc, &bs, &bits, 1, 0);
+			bframes_count = 0;
 
 			pFrame->intra = 0;
 			
 		} else {
 
 			FrameCodeI(pEnc, &bs, &bits);
+			bframes_count = 0;
 			pFrame->intra = 1;
 
 			pEnc->bframenum_dx50bvop = -1;
@@ -995,10 +998,11 @@
 		}
 
 		FrameCodeP(pEnc, &bs, &bits, 1, 0);
+		bframes_count = 0;
 		pFrame->intra = 0;
 		pEnc->flush_bframes = 1;
 
-		if ((pEnc->global & XVID_GLOBAL_PACKED)) {
+		if ((pEnc->global & XVID_GLOBAL_PACKED) && (pEnc->bframenum_tail > 0)) {
 			BitstreamPadAlways(&bs);
 			input_valid = 0;
 			goto ipvop_loop;
@@ -1907,7 +1911,7 @@
 		((int32_t)(pEnc->current->stamp - pEnc->reference->stamp)), 	// time_pp
 			pEnc->reference->mbs, f_ref,
 						 &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv,
-						 pEnc->current->mbs, b_ref, &pEnc->vInterH,
+						 pEnc->current, b_ref, &pEnc->vInterH,
 						 &pEnc->vInterV, &pEnc->vInterHV);