--- branches/dev-api-4/xvidcore/examples/xvid_encraw.c	2003/04/18 20:06:58	990
+++ branches/dev-api-4/xvidcore/examples/xvid_encraw.c	2003/04/27 20:36:13	997
@@ -19,7 +19,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: xvid_encraw.c,v 1.11.2.17 2003-04-18 20:06:58 chl Exp $
+ * $Id: xvid_encraw.c,v 1.11.2.20 2003-04-27 20:36:13 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -52,32 +52,35 @@
  ****************************************************************************/
 
 static xvid_motion_t const motion_presets[] = {
-	0,
-	XVID_ME_HALFPELREFINE16,
-	XVID_ME_HALFPELREFINE16,
-	XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8,
+	0,																			/* 0 */
+	XVID_ME_HALFPELREFINE16,													/* 1 */
+	XVID_ME_HALFPELREFINE16,													/* 2 */
+	XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8,							/* 3 */
+	XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8,							/* 4 */
 	XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8 | XVID_ME_EXTSEARCH16 |
-		XVID_ME_USESQUARES16,
+		XVID_ME_USESQUARES16,													/* 5 */
 	XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8 | XVID_ME_EXTSEARCH16 |
-		XVID_ME_USESQUARES16 | XVID_ME_CHROMA16 | XVID_ME_CHROMA8,
+		XVID_ME_USESQUARES16 | XVID_ME_CHROMA16 | XVID_ME_CHROMA8,				/* 6 */
 };
 
 static xvid_vol_t const vol_presets[] = {
-	XVID_VOL_MPEGQUANT,
-	0,
-	0,
-	XVID_VOL_QUARTERPEL,
-	XVID_VOL_QUARTERPEL | XVID_VOL_GMC,
-	0
+	XVID_VOL_MPEGQUANT,															/* 0 */
+	0,																			/* 1 */
+	0,																			/* 2 */
+	0,																			/* 3 */
+	0,																			/* 4 */
+	XVID_VOL_QUARTERPEL | XVID_VOL_GMC,											/* 5 */
+	0																			/* 6 */
 };
 
 static xvid_vop_t const vop_presets[] = {
-	XVID_VOP_DYNAMIC_BFRAMES,
-	XVID_VOP_DYNAMIC_BFRAMES,
-	XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL,
-	XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL | XVID_VOP_INTER4V,
-	XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL | XVID_VOP_INTER4V | XVID_VOP_HQACPRED,
-	XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL | XVID_VOP_HQACPRED |
+	XVID_VOP_DYNAMIC_BFRAMES,																/* 0 */
+	XVID_VOP_DYNAMIC_BFRAMES,																/* 1 */
+	XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL,											/* 2 */
+	XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL | XVID_VOP_INTER4V, 						/* 3 */
+	XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL | XVID_VOP_INTER4V | XVID_VOP_TRELLISQUANT, /* 4 */
+	XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL | XVID_VOP_INTER4V | XVID_VOP_HQACPRED, 	/* 5 */
+	XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL | XVID_VOP_HQACPRED |						/* 6 */
 		XVID_VOP_MODEDECISION_BITS
 };
 
@@ -96,7 +99,7 @@
 static char *ARG_PASS2 = 0;
 static int ARG_PASS2_BITRATE = 0;
 static float ARG_QUANTI = 0.0f;
-static int ARG_QUALITY = 5;
+static int ARG_QUALITY = 3;
 static float ARG_FRAMERATE = 25.00f;
 static int ARG_MAXFRAMENR = ABS_MAXFRAMENR;
 static char *ARG_INPUTFILE = NULL;
@@ -174,6 +177,7 @@
 
 	double enctime;
 	double totalenctime = 0.;
+	float totalPSNR[3] = {0., 0., 0.};
 
 	int totalsize;
 	int result;
@@ -282,7 +286,7 @@
 		ARG_INPUTTYPE = 1;		/* pgm */
 	}
 
-	if (ARG_QUALITY < 0 || ARG_QUALITY > 5) {
+	if (ARG_QUALITY < 0 || ARG_QUALITY > 6) {
 		fprintf(stderr, "Wrong Quality\n");
 		return (-1);
 	}
@@ -427,6 +431,10 @@
 					   SSE2PSNR(sse[0], XDIM, YDIM), SSE2PSNR(sse[1], XDIM / 2,
 															  YDIM / 2),
 					   SSE2PSNR(sse[2], XDIM / 2, YDIM / 2));
+
+				totalPSNR[0] += SSE2PSNR(sse[0], XDIM, YDIM);
+				totalPSNR[1] += SSE2PSNR(sse[1], XDIM/2, YDIM/2);
+				totalPSNR[2] += SSE2PSNR(sse[2], XDIM/2, YDIM/2);
 			}
 
 		}
@@ -483,13 +491,21 @@
 	if (input_num > 0) {
 		totalsize /= input_num;
 		totalenctime /= input_num;
+		totalPSNR[0] /= input_num;
+		totalPSNR[1] /= input_num;
+		totalPSNR[2] /= input_num;
 	} else {
 		totalsize = -1;
 		totalenctime = -1;
 	}
 
-	printf("Avg: enctime(ms) =%7.2f, fps =%7.2f, length(bytes) = %7d\n",
+	printf("Avg: enctime(ms) =%7.2f, fps =%7.2f, length(bytes) = %7d",
 		   totalenctime, 1000 / totalenctime, (int) totalsize);
+   if (ARG_STATS) {
+       printf(", psnr y = %2.2f, psnr u = %2.2f, psnr v = %2.2f",
+    		  totalPSNR[0],totalPSNR[1],totalPSNR[2]);
+	}
+	printf("\n");
 
 
 /*****************************************************************************