--- trunk/xvidcore/src/encoder.c	2002/08/04 21:32:56	358
+++ trunk/xvidcore/src/encoder.c	2002/09/03 17:25:45	387
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.70 2002-08-04 21:32:56 Isibaar Exp $
+ *  $Id: encoder.c,v 1.76 2002-09-03 17:25:18 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;
@@ -620,16 +621,28 @@
 }
 
 
-#ifdef BFRAMES
 void inc_frame_num(Encoder * pEnc)
 {
 	pEnc->mbParam.m_ticks += pEnc->mbParam.fincr;
 
+#ifdef BFRAMES
+	pEnc->mbParam.m_ticks = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase;
+	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;
+#else
+
 	pEnc->mbParam.m_seconds = pEnc->mbParam.m_ticks / pEnc->mbParam.fbase;
 	pEnc->mbParam.m_ticks = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase;
-}
+	
 #endif
 
+}
+
 
 #ifdef BFRAMES
 void queue_image(Encoder * pEnc, XVID_ENC_FRAME * pFrame)
@@ -825,7 +838,7 @@
 
 		pFrame->intra = 0;
 
-		BitstreamPutBits(&bs, 0x7f, 8);
+		BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); // write N_VOP
 		BitstreamPad(&bs);
 		pFrame->length = BitstreamLength(&bs);
 		
@@ -1119,10 +1132,8 @@
 
 	pEnc->current->global_flags = pFrame->general;
 	pEnc->current->motion_flags = pFrame->motion;
-#ifdef BFRAMES
 	pEnc->current->seconds = pEnc->mbParam.m_seconds;
 	pEnc->current->ticks = pEnc->mbParam.m_ticks;
-#endif
 	pEnc->mbParam.hint = &pFrame->hint;
 
 	start_timer();
@@ -1933,8 +1944,7 @@
 
 			mb->quant = frame->quant;
 			mb->cbp =
-				MBTransQuantInter(&pEnc->mbParam, frame, mb, x, y, dct_codes,
-								  qcoeff);
+				MBTransQuantInterBVOP(&pEnc->mbParam, frame, mb, dct_codes, qcoeff);
 			//mb->cbp = MBTransQuantBVOP(&pEnc->mbParam, x, y, dct_codes, qcoeff, &frame->image, frame->quant);
 
 			if ( (mb->mode == MODE_DIRECT) && (mb->cbp == 0)