--- trunk/xvidcore/src/encoder.c	2002/07/11 00:15:59	290
+++ trunk/xvidcore/src/encoder.c	2002/07/21 14:05:38	325
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.54 2002-07-11 00:15:59 chenm001 Exp $
+ *  $Id: encoder.c,v 1.61 2002-07-21 14:05:38 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -209,10 +209,9 @@
 
 	/* 1 keyframe each 10 seconds */
 
-	if (pParam->max_key_interval == 0)
+	if (pParam->max_key_interval <= 0)
 		pParam->max_key_interval = 10 * pParam->fincr / pParam->fbase;
 
-
 	pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE);
 	if (pEnc == NULL)
 		return XVID_ERR_MEMORY;
@@ -237,6 +236,10 @@
 
 	pEnc->mbParam.m_quant_type = H263_QUANT;
 
+#ifdef _SMP
+	pEnc->mbParam.num_threads = MIN(pParam->num_threads, MAXNUMTHREADS);
+#endif
+
 	pEnc->sStat.fMvPrevSigma = -1;
 
 	/* Fill rate control parameters */
@@ -341,6 +344,7 @@
 	pEnc->global = pParam->global;
 	pEnc->mbParam.max_bframes = pParam->max_bframes;
 	pEnc->bquant_ratio = pParam->bquant_ratio;
+	pEnc->frame_drop_ratio = pParam->frame_drop_ratio;
 	pEnc->bframes = NULL;
 
 	if (pEnc->mbParam.max_bframes > 0) {
@@ -418,6 +422,7 @@
 	pEnc->mbParam.m_seconds = 0;
 	pEnc->mbParam.m_ticks = 0;
 	pEnc->m_framenum = 0;
+	pEnc->last_pframe = 1;
 #endif
 
 	pParam->handle = (void *) pEnc;
@@ -1595,20 +1600,18 @@
 	} else {
 
 #ifdef _SMP
-		if (NUMTHREADS > 1)
-			bIntra =
-				SMP_MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
-							 &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
-							 iLimit);
-		else
+	if (pEnc->mbParam.num_threads > 1)
+		bIntra =
+			SMP_MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
+						 &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
+						 iLimit);
+	else
 #endif
-
-                bIntra =
-                         MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
-                                                    &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
-                                                    iLimit);
-		
-	
+		bIntra =
+			MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
+                         &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
+                         iLimit);
+			
 	}
 	stop_motion_timer();
 
@@ -1720,8 +1723,37 @@
 
 	pEnc->sStat.fMvPrevSigma = fSigma;
 
+#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 <=
+		(pEnc->frame_drop_ratio * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height) / 100)
+	{
+		pEnc->sStat.kblks = pEnc->sStat.mblks = 0;
+		pEnc->sStat.ublks = pEnc->mbParam.mb_width * pEnc->mbParam.mb_height;
+
+		BitstreamReset(bs);
+		BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 0);
+
+		// copy reference frame details into the current frame
+		pEnc->current->quant = pEnc->reference->quant;
+		pEnc->current->motion_flags = pEnc->reference->motion_flags;
+		pEnc->current->rounding_type = pEnc->reference->rounding_type;
+		pEnc->current->fcode = pEnc->reference->fcode;
+		pEnc->current->bcode = pEnc->reference->bcode;
+		image_copy(&pEnc->current->image, &pEnc->reference->image, pEnc->mbParam.edged_width, pEnc->mbParam.height);
+		memcpy(pEnc->current->mbs, pEnc->reference->mbs, sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height);
+
+	}
+#endif
+
 	*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;
+#endif
 	return 0;					// inter
 }
 
@@ -1777,7 +1809,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);
@@ -1843,7 +1878,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) {