--- trunk/xvidcore/src/encoder.c	2002/07/29 19:21:23	349
+++ trunk/xvidcore/src/encoder.c	2002/08/04 21:32:56	358
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.66 2002-07-29 19:21:23 chl Exp $
+ *  $Id: encoder.c,v 1.70 2002-08-04 21:32:56 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -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;
@@ -1044,6 +1043,8 @@
 		goto bvop_loop;
 	}
 
+	pEnc->iFrameNum++;
+
 	BitstreamPad(&bs);
 	pFrame->length = BitstreamLength(&bs);
 
@@ -1251,12 +1252,8 @@
 	DEBUG(temp);
 #endif
 
-#ifdef BFRAMES
 	inc_frame_num(pEnc);
-#else
 	pEnc->iFrameNum++;
-#endif
-
 
 	stop_global_timer();
 	write_timer();
@@ -1536,6 +1533,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 +1574,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 +1726,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 +1787,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;