--- encoder.c	2002/07/12 12:26:23	1.55
+++ encoder.c	2002/07/19 15:02:38	1.58
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.55 2002/07/12 12:26:23 suxen_drol Exp $
+ *  $Id: encoder.c,v 1.58 2002/07/19 15:02:38 chl Exp $
  *
  ****************************************************************************/
 
@@ -421,6 +421,7 @@
 	pEnc->mbParam.m_seconds = 0;
 	pEnc->mbParam.m_ticks = 0;
 	pEnc->m_framenum = 0;
+	pEnc->last_pframe = 1;
 #endif
 
 	pParam->handle = (void *) pEnc;
@@ -1723,6 +1724,9 @@
 
 	*pBits = BitstreamPos(bs) - *pBits;
 
+	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;
 	return 0;					// inter
 }
 
@@ -1778,7 +1782,10 @@
 	stop_inter_timer();
 
 	start_timer();
-	MotionEstimationBVOP(&pEnc->mbParam, frame, pEnc->reference->mbs, f_ref,
+	MotionEstimationBVOP(&pEnc->mbParam, frame, 
+ 	  ((int32_t)pEnc->mbParam.fbase + (int32_t)pEnc->mbParam.m_ticks + 1 - (int32_t)pEnc->last_pframe) % pEnc->mbParam.fbase, 
+						pEnc->time_pp, 
+						pEnc->reference->mbs, f_ref,
 						 &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv,
 						 pEnc->current->mbs, b_ref, &pEnc->vInterH,
 						 &pEnc->vInterV, &pEnc->vInterHV);
@@ -1844,7 +1851,7 @@
 
 			if ((mb->mode == MODE_INTERPOLATE || mb->mode == MODE_DIRECT)
 				&& mb->cbp == 0 && mb->mvs[0].x == 0 && mb->mvs[0].y == 0) {
-				mb->mode = 5;	// skipped
+				mb->mode = MODE_DIRECT_NONE_MV;	// skipped
 			}
 
 			if (mb->mode == MODE_INTERPOLATE || mb->mode == MODE_FORWARD) {