--- trunk/xvidcore/src/encoder.c	2002/07/28 13:06:46	347
+++ trunk/xvidcore/src/encoder.c	2002/08/04 23:27:40	360
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.65 2002-07-28 13:06:45 chl Exp $
+ *  $Id: encoder.c,v 1.72 2002-08-04 23:27:40 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -424,7 +424,7 @@
 	pEnc->mbParam.m_seconds = 0;
 	pEnc->mbParam.m_ticks = 0;
 	pEnc->m_framenum = 0;
-	pEnc->last_pframe = 1;
+	pEnc->last_pframe = 0;
 #endif
 
 	pParam->handle = (void *) pEnc;
@@ -623,7 +623,6 @@
 #ifdef BFRAMES
 void inc_frame_num(Encoder * pEnc)
 {
-	pEnc->iFrameNum++;
 	pEnc->mbParam.m_ticks += pEnc->mbParam.fincr;
 
 	pEnc->mbParam.m_seconds = pEnc->mbParam.m_ticks / pEnc->mbParam.fbase;
@@ -826,7 +825,7 @@
 
 		pFrame->intra = 0;
 
-		BitstreamPutBits(&bs, 0x7f, 8);
+		BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); // write N_VOP
 		BitstreamPad(&bs);
 		pFrame->length = BitstreamLength(&bs);
 		
@@ -1044,6 +1043,8 @@
 		goto bvop_loop;
 	}
 
+	pEnc->iFrameNum++;
+
 	BitstreamPad(&bs);
 	pFrame->length = BitstreamLength(&bs);
 
@@ -1253,10 +1254,8 @@
 
 #ifdef BFRAMES
 	inc_frame_num(pEnc);
-#else
-	pEnc->iFrameNum++;
 #endif
-
+	pEnc->iFrameNum++;
 
 	stop_global_timer();
 	write_timer();
@@ -1536,6 +1535,11 @@
 			stop_prediction_timer();
 
 			start_timer();
+			if (pEnc->current->global_flags & XVID_GREYSCALE)
+			{	pMB->cbp &= 0x3C;		/* keep only bits 5-2 */
+				qcoeff[4*64+0]=0;		/* zero, because for INTRA MBs DC value is saved */
+				qcoeff[5*64+0]=0;
+			}
 			MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat);
 			stop_coding_timer();
 		}
@@ -1572,8 +1576,7 @@
 	DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);
 
 	int iLimit;
-	int k;
-	int x, y;
+	int x, y, k;
 	int iSearchRange;
 	int bIntra;
 	
@@ -1725,19 +1728,28 @@
 				}
 				if (!bSkip) 
 				{	
+					if (pEnc->current->global_flags & XVID_GREYSCALE)
+					{	pMB->cbp &= 0x3C;		/* keep only bits 5-2 */
+						qcoeff[4*64+0]=0;		/* zero, because DC for INTRA MBs DC value is saved */
+						qcoeff[5*64+0]=0;
+					}
 					MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat);
 					pMB->cbp = 0x80;		/* trick! so cbp!=0, but still nothing is written to bs */
 				}
 				else 
 					MBSkip(bs);
-				
 
 #else
 					MBSkip(bs);	/* without B-frames, no precautions are needed */
 
-#endif			
+#endif
 
 			} else {
+				if (pEnc->current->global_flags & XVID_GREYSCALE)
+				{	pMB->cbp &= 0x3C;		/* keep only bits 5-2 */
+					qcoeff[4*64+0]=0;		/* zero, because DC for INTRA MBs DC value is saved */
+					qcoeff[5*64+0]=0;
+				}
 				MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat);
 			}
 
@@ -1777,7 +1789,7 @@
 #ifdef BFRAMES
 	/* frame drop code */
 	// DPRINTF(DPRINTF_DEBUG, "kmu %i %i %i", pEnc->sStat.kblks, pEnc->sStat.mblks, pEnc->sStat.ublks);
-	if (pEnc->sStat.kblks + pEnc->sStat.mblks <=
+	if (pEnc->sStat.kblks + pEnc->sStat.mblks <
 		(pEnc->frame_drop_ratio * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height) / 100)
 	{
 		pEnc->sStat.kblks = pEnc->sStat.mblks = 0;
@@ -1801,8 +1813,9 @@
 	*pBits = BitstreamPos(bs) - *pBits;
 
 #ifdef BFRAMES
-	pEnc->time_pp = ((int32_t)pEnc->mbParam.fbase - (int32_t)pEnc->last_pframe + (int32_t)pEnc->mbParam.m_ticks) % (int32_t)pEnc->mbParam.fbase;
-	pEnc->last_pframe = pEnc->mbParam.m_ticks;
+	pEnc->time_pp = ((int32_t)pEnc->mbParam.fbase - (int32_t)pEnc->last_pframe + (int32_t)pEnc->current->ticks) %
+			(int32_t)pEnc->mbParam.fbase;
+	pEnc->last_pframe = pEnc->current->ticks;
 #endif
 
 	return 0;					// inter
@@ -1861,7 +1874,7 @@
 
 	start_timer();
 	MotionEstimationBVOP(&pEnc->mbParam, frame, 
- 	  ((int32_t)pEnc->mbParam.fbase + (int32_t)pEnc->mbParam.m_ticks + 1 - (int32_t)pEnc->last_pframe) % pEnc->mbParam.fbase, 
+		((int32_t)pEnc->mbParam.fbase + pEnc->last_pframe - frame->ticks) % pEnc->mbParam.fbase,
 						pEnc->time_pp, 
 						pEnc->reference->mbs, f_ref,
 						 &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv,