--- estimation_pvop.c	2004/12/05 04:53:01	1.9
+++ estimation_pvop.c	2005/03/04 22:13:33	1.15
@@ -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: estimation_pvop.c,v 1.9 2004/12/05 04:53:01 syskin Exp $
+ * $Id: estimation_pvop.c,v 1.15 2005/03/04 22:13:33 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -751,6 +751,39 @@
 	return Flags;
 }
 
+static __inline void
+motionStatsPVOP(int * const MVmax, int * const mvCount, int * const mvSum,
+				const MACROBLOCK * const pMB, const int qpel)
+{
+	const VECTOR * const mv = qpel ? pMB->qmvs : pMB->mvs;
+	int i;
+	int max = *MVmax;
+
+	switch (pMB->mode) {
+	case MODE_INTER4V:
+		*mvCount += 3;
+		for(i = 3; i; i--) {
+			if (mv[i].x > max) max = mv[i].x;
+			else if (-mv[i].x - 1 > max) max = -mv[i].x - 1;
+			*mvSum += mv[i].x * mv[i].x;
+			if (mv[i].y > max) max = mv[i].y;
+			else if (-mv[i].y - 1 > max) max = -mv[i].y - 1;
+			*mvSum += mv[i].y * mv[i].y;
+		}
+	case MODE_INTER:
+		(*mvCount)++;
+		*mvSum += mv[0].x * mv[0].x;
+		*mvSum += mv[0].y * mv[0].y;
+		if (mv[0].x > max) max = mv[0].x;
+		else if (-mv[0].x - 1 > max) max = -mv[0].x - 1;
+		if (mv[0].y > max) max = mv[0].y;
+		else if (-mv[0].y - 1 > max) max = -mv[0].y - 1;
+		*MVmax = max;
+	default:
+		break;
+	}
+}
+
 bool
 MotionEstimation(MBParam * const pParam,
 				 FRAMEINFO * const current,
@@ -770,6 +803,7 @@
 	const uint32_t iEdgedWidth = pParam->edged_width;
 	const uint32_t MotionFlags = MakeGoodMotionFlags(current->motion_flags, current->vop_flags, current->vol_flags);
 	int stat_thresh = 0;
+	int MVmax = 0, mvSum = 0, mvCount = 0;
 
 	uint32_t x, y;
 	int32_t sad00;
@@ -824,11 +858,19 @@
 			}
 
 			if(MotionFlags & XVID_ME_DETECT_STATIC_MOTION) {
+				VECTOR *cmpMV;
+				VECTOR staticMV = { 0, 0 };
+				
+				if (current->coding_type == S_VOP) 
+					cmpMV = &pMB->amv;
+				else
+					cmpMV = &staticMV;
+
 				if(x > 0 && y > 0 && x < pParam->mb_width) {
-					if(MVequal((&pMBs[(x-1) + y * pParam->mb_width])->mvs[0], zeroMV) &&
-					   MVequal((&pMBs[x + (y-1) * pParam->mb_width])->mvs[0], zeroMV) &&
-				       MVequal((&pMBs[(x+1) + (y-1) * pParam->mb_width])->mvs[0], zeroMV) &&
-				       MVequal(prevMB->mvs[0], zeroMV)) {
+					if(MVequal((&pMBs[(x-1) + y * pParam->mb_width])->mvs[0], *cmpMV) &&
+					   MVequal((&pMBs[x + (y-1) * pParam->mb_width])->mvs[0], *cmpMV) &&
+				       MVequal((&pMBs[(x+1) + (y-1) * pParam->mb_width])->mvs[0], *cmpMV) &&
+				       MVequal(prevMB->mvs[0], *cmpMV)) {
 						stat_thresh = MAX((&pMBs[(x-1) + y * pParam->mb_width])->sad16,
 								 	  MAX((&pMBs[x + (y-1) * pParam->mb_width])->sad16,
 									  MAX((&pMBs[(x+1) + (y-1) * pParam->mb_width])->sad16,
@@ -842,11 +884,36 @@
 				}
 			}
 
-			 /* favorize (0,0) vector for cartoons */
-			if ((current->vop_flags & XVID_VOP_CARTOON) &&
-				((sad00 < pMB->quant * 4 * skip_thresh) || (sad00 < stat_thresh))) {
-				ZeroMacroblockP(pMB, sad00);
-				continue;
+			 /* favorize (0,0) or global vector for cartoons */
+			if (current->vop_flags & XVID_VOP_CARTOON) {
+				if (current->coding_type == S_VOP) {
+					int32_t iSAD = sad16(pCurrent->y + (x + y * iEdgedWidth) * 16,
+					pGMC->y + 16*y*iEdgedWidth + 16*x, iEdgedWidth, 65536);
+
+					if (Data.chroma) {
+						iSAD += sad8(pCurrent->u + x*8 + y*(iEdgedWidth/2)*8, pGMC->u + 8*y*(iEdgedWidth/2) + 8*x, iEdgedWidth/2);
+						iSAD += sad8(pCurrent->v + (x + y*(iEdgedWidth/2))*8, pGMC->v + 8*y*(iEdgedWidth/2) + 8*x, iEdgedWidth/2);
+					}
+
+					if (iSAD <= stat_thresh) {		/* mode decision GMC */
+						pMB->mode = MODE_INTER;
+						pMB->sad16 = pMB->sad8[0] = pMB->sad8[1] = pMB->sad8[2] = pMB->sad8[3] = iSAD;
+						pMB->mcsel = 1;
+						if (Data.qpel) {
+							pMB->qmvs[0] = pMB->qmvs[1] = pMB->qmvs[2] = pMB->qmvs[3] = pMB->amv;
+							pMB->mvs[0].x = pMB->mvs[1].x = pMB->mvs[2].x = pMB->mvs[3].x = pMB->amv.x/2;
+							pMB->mvs[0].y = pMB->mvs[1].y = pMB->mvs[2].y = pMB->mvs[3].y = pMB->amv.y/2;
+						} else
+							pMB->mvs[0] = pMB->mvs[1] = pMB->mvs[2] = pMB->mvs[3] = pMB->amv;
+						
+						continue;
+					}
+				}
+				else if (sad00 < stat_thresh) {
+					ZeroMacroblockP(pMB, sad00);
+					pMB->cbp = 0x3f;
+					continue;
+				}
 			}
 
 			SearchP(pRef, pRefH->y, pRefV->y, pRefHV->y, pCurrent, x,
@@ -868,9 +935,13 @@
 								pCurrent, pRef, pGMC, current->coding_type, sad00);
 
 
+			motionStatsPVOP(&MVmax, &mvCount, &mvSum, pMB, Data.qpel);
 		}
 	}
-	return 0;
-}
 
+	current->fcode = getMinFcode(MVmax);
+	current->sStat.iMvSum = mvSum;
+	current->sStat.iMvCount = mvCount;
 
+	return 0;
+}