--- encoder.c	2002/07/31 18:19:49	1.68
+++ encoder.c	2002/08/09 20:05:28	1.74
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.68 2002/07/31 18:19:49 chl Exp $
+ *  $Id: encoder.c,v 1.74 2002/08/09 20:05:28 chl Exp $
  *
  ****************************************************************************/
 
@@ -425,6 +425,7 @@
 	pEnc->mbParam.m_ticks = 0;
 	pEnc->m_framenum = 0;
 	pEnc->last_pframe = 0;
+	pEnc->last_sync = 0;
 #endif
 
 	pParam->handle = (void *) pEnc;
@@ -623,11 +624,23 @@
 #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;
 	pEnc->mbParam.m_ticks = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase;
+
+/*	fprintf(stderr, "ENC %c %i:%i %i\n", 
+		pEnc->current->coding_type == I_VOP ? 'I' : pEnc->current->coding_type == P_VOP ? 'P' : 'B',
+		pEnc->mbParam.m_seconds, pEnc->mbParam.m_ticks,pEnc->last_sync);
+*/
+
+	if (pEnc->mbParam.m_ticks < pEnc->last_sync) 
+		pEnc->mbParam.m_seconds = 1;		// more than 1 second since last I or P is not supported. 
+	else
+		pEnc->mbParam.m_seconds = 0;
+
+	if (pEnc->current->coding_type != B_VOP)
+		pEnc->last_sync = pEnc->mbParam.m_ticks;
+
 }
 #endif
 
@@ -826,7 +839,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 +1057,8 @@
 		goto bvop_loop;
 	}
 
+	pEnc->iFrameNum++;
+
 	BitstreamPad(&bs);
 	pFrame->length = BitstreamLength(&bs);
 
@@ -1253,10 +1268,8 @@
 
 #ifdef BFRAMES
 	inc_frame_num(pEnc);
-#else
-	pEnc->iFrameNum++;
 #endif
-
+	pEnc->iFrameNum++;
 
 	stop_global_timer();
 	write_timer();
@@ -1577,7 +1590,7 @@
 	DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);
 
 	int iLimit;
-	int x, y;
+	int x, y, k;
 	int iSearchRange;
 	int bIntra;
 	
@@ -1936,7 +1949,7 @@
 
 			mb->quant = frame->quant;
 			mb->cbp =
-				MBTransQuantInter(&pEnc->mbParam, frame, mb, x, y, dct_codes,
+				MBTransQuantInterBVOP(&pEnc->mbParam, frame, mb, x, y, dct_codes,
 								  qcoeff);
 			//mb->cbp = MBTransQuantBVOP(&pEnc->mbParam, x, y, dct_codes, qcoeff, &frame->image, frame->quant);