--- 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/19 13:21:25	659
@@ -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.20 2002-11-19 13:21:25 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -327,6 +327,7 @@
 	pEnc->global = pParam->global;
 	pEnc->mbParam.max_bframes = pParam->max_bframes;
 	pEnc->bquant_ratio = pParam->bquant_ratio;
+	pEnc->bquant_offset = pParam->bquant_offset;
 	pEnc->frame_drop_ratio = pParam->frame_drop_ratio;
 	pEnc->bframes = NULL;
 
@@ -666,6 +667,7 @@
 	uint32_t bits, mode;
 
 	int input_valid = 1;
+	int bframes_count = 0;
 
 #ifdef _DEBUG_PSNR
 	float psnr;
@@ -706,6 +708,7 @@
 			SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]);
 
 			FrameCodeP(pEnc, &bs, &bits, 1, 0);
+			bframes_count = 0;
 
 			BitstreamPad(&bs);
 			pFrame->length = BitstreamLength(&bs);
@@ -726,7 +729,7 @@
 
 		BitstreamPad(&bs);
 		pFrame->length = BitstreamLength(&bs);
-		pFrame->intra = 0;
+		pFrame->intra = 2;
 
 		if (input_valid)
 			queue_image(pEnc, pFrame);
@@ -761,7 +764,7 @@
 			pEnc->current->seconds = tmp;
 
 			pFrame->length = BitstreamLength(&bs);
-			pFrame->intra = 0;
+			pFrame->intra = 4;
 
 			if (input_valid)
 				queue_image(pEnc, pFrame);
@@ -837,7 +840,7 @@
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
 			BitstreamPutBits(&bs, 0x7f, 8);
-			pFrame->intra = 0;
+			pFrame->intra = 5;
 		}
 
 		pFrame->length = BitstreamLength(&bs);
@@ -924,19 +927,21 @@
 	 * ivop/pvop/bvop selection
 	 * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */
 
-
 	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
 		 */
+		if ((pEnc->current->global_flags & XVID_QUARTERPEL))
+			pEnc->mbParam.m_quarterpel = 1;
+		else
+			pEnc->mbParam.m_quarterpel = 0;
 
 		DPRINTF(DPRINTF_DEBUG,"*** IFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
@@ -958,12 +963,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;
@@ -982,6 +989,7 @@
 		 *      go screwy with divx 5.00
 		 */
 	} else if (pEnc->bframenum_tail >= pEnc->mbParam.max_bframes || mode != 0) {
+// 	} else if (pFrame->intra == 0 || pEnc->bframenum_tail >= pEnc->mbParam.max_bframes || mode != 0) { 
 		/*
 		 * This will be coded as a Predicted Frame
 		 */
@@ -995,10 +1003,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;
@@ -1014,24 +1023,21 @@
 		}
 
 		if (pFrame->bquant < 1) {
-			pEnc->current->quant =
-				((pEnc->reference->quant +
-				  pEnc->current->quant) * pEnc->bquant_ratio) / 200;
+			pEnc->current->quant = ((((pEnc->reference->quant + pEnc->current->quant) * 
+				pEnc->bquant_ratio) / 2) + pEnc->bquant_offset)/100;
+
 		} else {
 			pEnc->current->quant = pFrame->bquant;
 		}
-                if (pEnc->current->quant < 1)
-                        pEnc->current->quant = 1;
 
-                if (pEnc->current->quant > 31)
-                        pEnc->current->quant = 31;
+		if (pEnc->current->quant < 1)
+			pEnc->current->quant = 1;
+		else if (pEnc->current->quant > 31)
+            pEnc->current->quant = 31;
  
-
-			DPRINTF(DPRINTF_DEBUG,"*** BFRAME (store) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i  quant=%i\n",
-                                pEnc->bframenum_head, pEnc->bframenum_tail,
-                                pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size,pEnc->current->quant);
-
-
+		DPRINTF(DPRINTF_DEBUG,"*** BFRAME (store) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i  quant=%i\n",
+				pEnc->bframenum_head, pEnc->bframenum_tail,
+				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size,pEnc->current->quant);
 
 		/* store frame into bframe buffer & swap ref back to current */
 		SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]);
@@ -1039,7 +1045,8 @@
 
 		pEnc->bframenum_tail++;
 
-		pFrame->intra = 0;
+// bframe report by koepi 
+		pFrame->intra = 2;
 		pFrame->length = 0;
 
 		input_valid = 0;
@@ -1907,7 +1914,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);