--- encoder.c	2002/11/02 16:12:27	1.76.2.15
+++ encoder.c	2002/11/19 13:03:57	1.76.2.19
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.76.2.15 2002/11/02 16:12:27 chl Exp $
+ *  $Id: encoder.c,v 1.76.2.19 2002/11/19 13:03:57 syskin Exp $
  *
  ****************************************************************************/
 
@@ -107,13 +107,6 @@
 };
 
 
-static void __inline
-image_null(IMAGE * image)
-{
-	image->y = image->u = image->v = NULL;
-}
-
-
 /*****************************************************************************
  * Encoder creation
  *
@@ -623,7 +616,7 @@
 	start_timer();
 	if (image_input
 		(&pEnc->queue[pEnc->queue_tail], pEnc->mbParam.width, pEnc->mbParam.height,
-		 pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace))
+		 pEnc->mbParam.edged_width, pFrame->image, pFrame->stride, pFrame->colorspace, pFrame->general & XVID_INTERLACING))
 		return;
 	stop_conv_timer();
 
@@ -673,6 +666,7 @@
 	uint32_t bits, mode;
 
 	int input_valid = 1;
+	int bframes_count = 0;
 
 #ifdef _DEBUG_PSNR
 	float psnr;
@@ -713,11 +707,14 @@
 			SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]);
 
 			FrameCodeP(pEnc, &bs, &bits, 1, 0);
+			bframes_count = 0;
 
 			BitstreamPad(&bs);
 			pFrame->length = BitstreamLength(&bs);
 			pFrame->intra = 0;
 
+			emms();
+
 			return XVID_ERR_OK;
 		}
 
@@ -736,6 +733,8 @@
 		if (input_valid)
 			queue_image(pEnc, pFrame);
 
+		emms();
+
 		return XVID_ERR_OK;
 	}
 
@@ -769,6 +768,8 @@
 			if (input_valid)
 				queue_image(pEnc, pFrame);
 
+			emms();
+
 			return XVID_ERR_OK;
 		}
 	}
@@ -799,8 +800,11 @@
 		start_timer();
 		if (image_input
 			(&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height,
-			pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace))
+			pEnc->mbParam.edged_width, pFrame->image, pFrame->stride, pFrame->colorspace, pFrame->general & XVID_INTERLACING))
+		{
+			emms();
 			return XVID_ERR_FORMAT;
+		}
 		stop_conv_timer();
 
 		// queue input frame, and dequue next image
@@ -839,6 +843,7 @@
 		}
 
 		pFrame->length = BitstreamLength(&bs);
+		emms();
 		return XVID_ERR_OK;
 	}
 
@@ -925,15 +930,18 @@
 	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,
@@ -955,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;
@@ -992,10 +1002,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;
@@ -1076,6 +1087,7 @@
 	stop_global_timer();
 	write_timer();
 
+	emms();
 	return XVID_ERR_OK;
 }
 
@@ -1130,7 +1142,7 @@
 	start_timer();
 	if (image_input
 		(&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height,
-		 pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace) < 0)
+		 pEnc->mbParam.edged_width, pFrame->image, pFrame->stride, pFrame->colorspace, pFrame->general & XVID_INTERLACING) < 0)
 		return XVID_ERR_FORMAT;
 	stop_conv_timer();
 
@@ -1621,6 +1633,7 @@
 
 	if (pEnc->current->global_flags & XVID_GMC) {
 //		printf("Global Motion = %d %d quarterpel=%d\n", pEnc->current->GMC_MV.x, pEnc->current->GMC_MV.y,pEnc->current->quarterpel);
+		DPRINTF(DPRINTF_HEADER, "Global Motion = %d %d quarterpel=%d\n", pEnc->current->GMC_MV.x, pEnc->current->GMC_MV.y,pEnc->current->quarterpel);
 		pEnc->current->coding_type = S_VOP;
 	} else
 		pEnc->current->coding_type = P_VOP;
@@ -1902,7 +1915,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);