--- trunk/xvidcore/src/encoder.c	2002/06/24 09:53:18	238
+++ trunk/xvidcore/src/encoder.c	2002/06/30 10:46:29	252
@@ -37,7 +37,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.48 2002-06-24 09:53:17 suxen_drol Exp $
+ *  $Id: encoder.c,v 1.51 2002-06-30 10:46:29 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -625,11 +625,11 @@
 {
 	if (pEnc->queue_size >= pEnc->mbParam.max_bframes)
 	{
-		DPRINTF("FATAL: QUEUE FULL");
+		DPRINTF(DPRINTF_DEBUG,"FATAL: QUEUE FULL");
 		return;
 	}
 
-	DPRINTF("*** QUEUE bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+	DPRINTF(DPRINTF_DEBUG,"*** QUEUE bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
@@ -697,7 +697,7 @@
 			 * frame as a pframe
 			 */
 
-			DPRINTF("*** BFRAME (final frame) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+			DPRINTF(DPRINTF_DEBUG,"*** BFRAME (final frame) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
@@ -716,7 +716,7 @@
 		}
 
 		
-		DPRINTF("*** BFRAME (flush) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+		DPRINTF(DPRINTF_DEBUG,"*** BFRAME (flush) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
@@ -738,11 +738,10 @@
 
 		if ((pEnc->global & XVID_GLOBAL_PACKED)) {
 			
-			DPRINTF("*** EMPTY bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+			DPRINTF(DPRINTF_DEBUG,"*** EMPTY bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
-
 			BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0);
 			BitstreamPad(&bs);
 			BitstreamPutBits(&bs, 0x7f, 8);
@@ -809,11 +808,10 @@
 
 	} else if (BitstreamPos(&bs) == 0) {
 
-		DPRINTF("*** SKIP bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+		DPRINTF(DPRINTF_DEBUG,"*** SKIP bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
-
 		pFrame->intra = 0;
 
 		BitstreamPutBits(&bs, 0x7f, 8);
@@ -916,7 +914,7 @@
 	 * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */
 
 
-	if (pEnc->iFrameNum == 0 || pFrame->intra == 1 || pEnc->bframenum_dx50bvop != -1 ||
+	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,
@@ -926,7 +924,7 @@
 		 * This will be coded as an Intra Frame
 		 */
 
-		DPRINTF("*** IFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+		DPRINTF(DPRINTF_DEBUG,"*** IFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 		
@@ -950,14 +948,16 @@
 			pFrame->intra = 0;
 			
 		} else {
-			pEnc->bframenum_dx50bvop = -1;
+
 			FrameCodeI(pEnc, &bs, &bits);
 			pFrame->intra = 1;
+
+			pEnc->bframenum_dx50bvop = -1;
 		}
 
 		pEnc->flush_bframes = 1;
 
-		if ((pEnc->global & XVID_GLOBAL_PACKED)) {
+		if ((pEnc->global & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) {
 			BitstreamPad(&bs);
 			input_valid = 0;
 			goto ipvop_loop;
@@ -972,7 +972,7 @@
 		 * This will be coded as a Predicted Frame
 		 */
 
-		DPRINTF("*** PFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+		DPRINTF(DPRINTF_DEBUG,"*** PFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 		
@@ -995,7 +995,7 @@
 		 * This will be coded as a Bidirectional Frame
 		 */
 
-		DPRINTF("*** BFRAME (store) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+		DPRINTF(DPRINTF_DEBUG,"*** BFRAME (store) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
@@ -1557,7 +1557,7 @@
 	uint32_t x, y;
 	int iSearchRange;
 	int bIntra;
-
+	
 	/* IMAGE *pCurrent = &pEnc->current->image; */
 	IMAGE *pRef = &pEnc->reference->image;