--- trunk/xvidcore/src/encoder.c	2004/04/04 11:47:21	1406
+++ trunk/xvidcore/src/encoder.c	2004/12/08 12:43:48	1567
@@ -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.105 2004-04-04 11:47:21 syskin Exp $
+ * $Id: encoder.c,v 1.111 2004-12-08 12:43:48 syskin Exp $
  *
  ****************************************************************************/
 
@@ -100,11 +100,22 @@
 		i--;
 	}
 
-	/* if neccessary, round to 65535 accuracy */
-	if (*base > 65535) {
-		float div = (float) *base / 65535;
-		*base = (int) (*base / div);
-		*inc = (int) (*inc / div);
+	if (*base > 65535 || *inc > 65535) {
+		int *biggest;
+		int *other;
+		float div;
+
+		if (*base > *inc) {
+			biggest = base;
+			other = inc;
+		} else {
+			biggest = inc;
+			other = base;
+		}
+		
+		div = ((float)*biggest)/((float)65535);
+		*biggest = (int)(((float)*biggest)/div);
+		*other = (int)(((float)*other)/div);
 	}
 }
 
@@ -1306,9 +1317,6 @@
 
 		/* prevent vol/vop misuse */
 
-		if (!(pEnc->current->vol_flags & XVID_VOL_REDUCED_ENABLE))
-			pEnc->current->vop_flags &= ~XVID_VOP_REDUCED;
-
 		if (!(pEnc->current->vol_flags & XVID_VOL_INTERLACING))
 			pEnc->current->vop_flags &= ~(XVID_VOP_TOPFIELDFIRST|XVID_VOP_ALTERNATESCAN);
 
@@ -1436,20 +1444,6 @@
 
 	uint16_t x, y;
 
-	if ((pEnc->current->vol_flags & XVID_VOL_REDUCED_ENABLE))
-	{
-		mb_width = (pEnc->mbParam.width + 31) / 32;
-		mb_height = (pEnc->mbParam.height + 31) / 32;
-
-		/* 16x16->8x8 downsample requires 1 additional edge pixel*/
-		/* XXX: setedges is overkill */
-		start_timer();
-		image_setedges(&pEnc->current->image,
-			pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,
-			pEnc->mbParam.width, pEnc->mbParam.height, 0);
-		stop_edges_timer();
-	}
-
 	pEnc->mbParam.m_rounding_type = 1;
 	pEnc->current->rounding_type = pEnc->mbParam.m_rounding_type;
 	pEnc->current->coding_type = I_VOP;
@@ -1494,12 +1488,6 @@
 			stop_coding_timer();
 		}
 
-	if ((pEnc->current->vop_flags & XVID_VOP_REDUCED))
-	{
-		image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width,
-			pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width,
-			16, 0);
-	}
 	emms();
 
 	BitstreamPadAlways(bs); /* next_start_code() at the end of VideoObjectPlane() */
@@ -1545,13 +1533,6 @@
 	/* IMAGE *pCurrent = &current->image; */
 	IMAGE *pRef = &reference->image;
 
-	if ((current->vop_flags & XVID_VOP_REDUCED))
-	{
-		mb_width = (pParam->width + 31) / 32;
-		mb_height = (pParam->height + 31) / 32;
-	}
-
-
 	if (!reference->is_edged) {	
 		start_timer();
 		image_setedges(pRef, pParam->edged_width, pParam->edged_height,
@@ -1577,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);
@@ -1645,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 =
@@ -1686,7 +1666,6 @@
 								 pParam->height,
 								 pParam->edged_width,
 								 (current->vol_flags & XVID_VOL_QUARTERPEL),
-								 (current->vop_flags & XVID_VOP_REDUCED),
 								 current->rounding_type);
 
 			stop_comp_timer();
@@ -1819,13 +1798,6 @@
 		}
 	}
 
-	if ((current->vop_flags & XVID_VOP_REDUCED))
-	{
-		image_deblock_rrv(&current->image, pParam->edged_width,
-			current->mbs, mb_width, mb_height, pParam->mb_width,
-			16, 0);
-	}
-
 	emms();
 
 	if (current->sStat.iMvCount == 0)
@@ -1833,21 +1805,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;
 
@@ -1934,8 +1900,6 @@
 		fprintf(fp,"Y=%3d   X=%3d   MB=%2d   CBP=%02X\n",y,x,mb->mode,mb->cbp); \
 	}
 
-	/* XXX: pEnc->current->global_flags &= ~XVID_VOP_REDUCED;  reduced resoltion not yet supported */
-
 	if (!first){
 		fp=fopen("C:\\XVIDDBGE.TXT","w");
 	}
@@ -2006,7 +1970,7 @@
 			if (mb->mode == MODE_NOT_CODED) {
 				if (pEnc->mbParam.plugin_flags & XVID_REQORIGINAL) {
 					MBMotionCompensation(mb, x, y, f_ref, NULL, f_ref, NULL, NULL, &frame->image,
-											NULL, 0, 0, pEnc->mbParam.edged_width, 0, 0, 0);
+											NULL, 0, 0, pEnc->mbParam.edged_width, 0, 0);
 				}
 
 				continue;