--- trunk/xvidcore/src/encoder.c	2004/12/05 13:56:13	1566
+++ trunk/xvidcore/src/encoder.c	2004/12/09 04:20:44	1568
@@ -21,7 +21,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: encoder.c,v 1.110 2004-12-05 13:56:13 syskin Exp $
+ * $Id: encoder.c,v 1.112 2004-12-09 04:20:44 syskin Exp $
  *
  ****************************************************************************/
 
@@ -1558,6 +1558,9 @@
 		}
 	}
 
+	current->sStat.iTextBits = current->sStat.iMvSum = current->sStat.iMvCount =
+		current->sStat.kblks = current->sStat.mblks = current->sStat.ublks = 0;
+
 	current->coding_type = P_VOP;
 
 	call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_FRAME, NULL, NULL, NULL);
@@ -1626,10 +1629,6 @@
 
 	BitstreamWriteVopHeader(bs, &pEnc->mbParam, current, 1, current->mbs[0].quant);
 
-	current->sStat.iTextBits = current->sStat.iMvSum = current->sStat.iMvCount =
-		current->sStat.kblks = current->sStat.mblks = current->sStat.ublks = 0;
-
-
 	for (y = 0; y < mb_height; y++) {
 		for (x = 0; x < mb_width; x++) {
 			MACROBLOCK *pMB =
@@ -1648,8 +1647,8 @@
 
 				current->sStat.kblks++;
 
-				if (pEnc->current->vop_flags & XVID_VOP_GREYSCALE)
-				{	pMB->cbp &= 0x3C;		/* keep only bits 5-2 */
+				if (pEnc->current->vop_flags & XVID_VOP_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;
 				}
@@ -1673,8 +1672,7 @@
 
 			pMB->field_pred = 0;
 
-			if (pMB->mode != MODE_NOT_CODED)
-			{	pMB->cbp =
+			if (pMB->cbp != 0) {
 					MBTransQuantInter(&pEnc->mbParam, current, pMB, x, y,
 									  dct_codes, qcoeff);
 			}
@@ -1806,21 +1804,15 @@
 
 	fSigma = (float) sqrt((float) current->sStat.iMvSum / current->sStat.iMvCount);
 
-	iSearchRange = 1 << (3 + pParam->m_fcode);
+	iSearchRange = 16 << pParam->m_fcode;
 
-	if ((fSigma > iSearchRange / 3)
-		&& (pParam->m_fcode <= (3 +  (pParam->vol_flags & XVID_VOL_QUARTERPEL?1:0)  )))	/* maximum search range 128 */
-	{
+	if ((3.0 * fSigma > iSearchRange) && (pParam->m_fcode <= 5) )
 		pParam->m_fcode++;
-		iSearchRange *= 2;
-	} else if ((fSigma < iSearchRange / 6)
-			   && (pEnc->fMvPrevSigma >= 0)
-			   && (pEnc->fMvPrevSigma < iSearchRange / 6)
-			   && (pParam->m_fcode >= (2 + (pParam->vol_flags & XVID_VOL_QUARTERPEL?1:0) )))	/* minimum search range 16 */
-	{
+
+	else if ((5.0 * fSigma < iSearchRange)
+			   && (4.0 * pEnc->fMvPrevSigma < iSearchRange)
+			   && (pParam->m_fcode >= 2) )	/* minimum search range 32 */
 		pParam->m_fcode--;
-		iSearchRange /= 2;
-	}
 
 	pEnc->fMvPrevSigma = fSigma;
 
@@ -1979,33 +1971,34 @@
 					MBMotionCompensation(mb, x, y, f_ref, NULL, f_ref, NULL, NULL, &frame->image,
 											NULL, 0, 0, pEnc->mbParam.edged_width, 0, 0);
 				}
-
 				continue;
 			}
 
-			if (mb->mode != MODE_DIRECT_NONE_MV || pEnc->mbParam.plugin_flags & XVID_REQORIGINAL) {
+			mb->quant = frame->quant;
+
+			if (mb->cbp != 0 || pEnc->mbParam.plugin_flags & XVID_REQORIGINAL) {
+				/* we have to motion-compensate, transfer etc, 
+					because there might be blocks to code */
+
 				MBMotionCompensationBVOP(&pEnc->mbParam, mb, x, y, &frame->image,
-									 f_ref, &pEnc->f_refh, &pEnc->f_refv,
-									 &pEnc->f_refhv, b_ref, &pEnc->vInterH,
-									 &pEnc->vInterV, &pEnc->vInterHV,
-									 dct_codes);
-
-				if (mb->mode == MODE_DIRECT_NO4V) mb->mode = MODE_DIRECT;
-				mb->quant = frame->quant;
-
-				if (mb->mode != MODE_DIRECT_NONE_MV)
-					mb->cbp = MBTransQuantInterBVOP(&pEnc->mbParam, frame, mb, x, y,  dct_codes, qcoeff);
-
-				if ( (mb->mode == MODE_DIRECT) && (mb->cbp == 0)
-					&& (mb->pmvs[3].x == 0) && (mb->pmvs[3].y == 0) ) {
-					mb->mode = MODE_DIRECT_NONE_MV;	/* skipped */
-				}
+										 f_ref, &pEnc->f_refh, &pEnc->f_refv,
+										 &pEnc->f_refhv, b_ref, &pEnc->vInterH,
+										 &pEnc->vInterV, &pEnc->vInterHV,
+										 dct_codes);
+
+				mb->cbp = MBTransQuantInterBVOP(&pEnc->mbParam, frame, mb, x, y,  dct_codes, qcoeff);
 			}
+			
+			if (mb->mode == MODE_DIRECT_NO4V)
+				mb->mode = MODE_DIRECT;
+
+			if (mb->mode == MODE_DIRECT && (mb->cbp | mb->pmvs[3].x | mb->pmvs[3].y) == 0)
+				mb->mode = MODE_DIRECT_NONE_MV;	/* skipped */
 
 			/* keep only bits 5-2 -- Chroma blocks will just be skipped by the
 			 * coding function for BFrames, that's why we don't zero teh DC
 			 * coeffs */
-			if ((frame->vop_flags & XVID_VOP_GREYSCALE))
+			if (frame->vop_flags & XVID_VOP_GREYSCALE)
 				mb->cbp &= 0x3C;
 
 			start_timer();