--- trunk/xvidcore/examples/xvid_encraw.c	2010/04/01 12:16:48	1886
+++ trunk/xvidcore/examples/xvid_encraw.c	2010/11/28 15:19:07	1909
@@ -22,7 +22,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.42 2010-04-01 12:16:48 Isibaar Exp $
+ * $Id: xvid_encraw.c,v 1.45 2010-11-28 15:19:07 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -189,6 +189,7 @@
 static 	int ARG_CPU_FLAGS = 0;
 static 	int ARG_STATS = 0;
 static 	int ARG_SSIM = -1;
+static 	int ARG_PSNRHVSM = 0;
 static 	char* ARG_SSIM_PATH = NULL;
 static 	int ARG_DUMP = 0;
 static 	int ARG_LUMIMASKING = 0;
@@ -230,6 +231,7 @@
 static 	int ARG_TURBO = 0;
 static 	int ARG_VHQMODE = 1;
 static 	int ARG_BVHQ = 0;
+static 	int ARG_QMETRIC = 0;
 static 	int ARG_CLOSED_GOP = 1;
 static 	int ARG_CHROMAME = 1;
 static 	int ARG_PAR = 1;
@@ -388,8 +390,8 @@
 				ARG_BITRATE = atoi(argv[i+1]);
 			if (ARG_BITRATE) {
 				i++;
-				if (ARG_BITRATE <= 10000)
-					/* if given parameter is <= 10000, assume it means kbps */
+				if (ARG_BITRATE <= 20000)
+					/* if given parameter is <= 20000, assume it means kbps */
 					ARG_BITRATE *= 1000;
 			}
 			else
@@ -550,6 +552,9 @@
 		} else if (strcmp("-vhqmode", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_VHQMODE = atoi(argv[i]);
+		} else if (strcmp("-metric", argv[i]) == 0 && i < argc - 1) {
+			i++;
+			ARG_QMETRIC = atoi(argv[i]);
 		} else if (strcmp("-framerate", argv[i]) == 0 && i < argc - 1) {
 			int exponent;
 			i++;
@@ -578,6 +583,8 @@
 				i++;
 				ARG_SSIM = atoi(argv[i]);
 			}
+		} else if (strcmp("-psnrhvsm", argv[i]) == 0) {
+			ARG_PSNRHVSM = 1;
 		} else if (strcmp("-ssim_file", argv[i]) == 0 && i < argc -1) {
 			i++;
 			ARG_SSIM_PATH = argv[i];
@@ -697,7 +704,7 @@
 			ARG_VBVMAXRATE = atoi(argv[i]);
 		} else if (strcmp("-vbvpeak", argv[i]) == 0 && i < argc -1) {
 			i++;
-			ARG_VBVPEAKRATE = atoi(argv[i])*3;
+			ARG_VBVPEAKRATE = atoi(argv[i]);
 		} else if (strcmp("-reaction", argv[i]) == 0 && i < argc -1) {
 			i++;
 			ARG_REACTION = atoi(argv[i]);
@@ -1865,6 +1872,7 @@
 	fprintf(stderr, " -quality integer               : quality ([0..%d]) (6)\n", ME_ELEMENTS - 1);
 	fprintf(stderr, " -vhqmode integer               : level of R-D optimizations ([0..4]) (1)\n");
 	fprintf(stderr, " -bvhq                          : use R-D optimizations for B-frames\n");
+	fprintf(stderr, " -metric integer                : distortion metric for R-D opt (PSNR:0, PSNRHVSM: 1)\n");
 	fprintf(stderr, " -qpel                          : use quarter pixel ME\n");
 	fprintf(stderr, " -gmc                           : use global motion compensation\n");
 	fprintf(stderr, " -qtype   integer               : quantization type (H263:0, MPEG4:1) (0)\n");
@@ -1876,6 +1884,7 @@
 	fprintf(stderr, " -stats                         : print stats about encoded frames\n");
 	fprintf(stderr, " -ssim [integer]                : prints ssim for every frame (accurate: 0 fast: 4) (2)\n");
 	fprintf(stderr, " -ssim_file filename            : outputs the ssim stats into a file\n");
+	fprintf(stderr, " -psnrhvsm                      : prints PSNRHVSM metric for every frame\n");
 	fprintf(stderr, " -debug                         : activates xvidcore internal debugging output\n");
 	fprintf(stderr, " -vop_debug                     : print some info directly into encoded frames\n");
 	fprintf(stderr, " -nochromame                    : Disable chroma motion estimation\n");
@@ -2112,7 +2121,7 @@
 	xvid_plugin_2pass1_t rc2pass1;
 	xvid_plugin_2pass2_t rc2pass2;
 	xvid_plugin_ssim_t ssim;
-        xvid_plugin_lumimasking_t masking;
+    xvid_plugin_lumimasking_t masking;
 	//xvid_plugin_fixed_t rcfixed;
 	xvid_enc_plugin_t plugins[8];
 	xvid_enc_create_t xvid_enc_create;
@@ -2174,7 +2183,7 @@
 		rc2pass2.vbv_size     =  ARG_VBVSIZE;
 		rc2pass2.vbv_initial  =  (ARG_VBVSIZE*3)/4;
 		rc2pass2.vbv_maxrate  =  ARG_VBVMAXRATE;
-		rc2pass2.vbv_peakrate =  ARG_VBVPEAKRATE*3;
+		rc2pass2.vbv_peakrate =  ARG_VBVPEAKRATE;
 
 
 		plugins[xvid_enc_create.num_plugins].func = xvid_plugin_2pass2;
@@ -2241,6 +2250,12 @@
 		xvid_enc_create.num_plugins++;
 	}
 
+	if (ARG_PSNRHVSM>0) {
+        plugins[xvid_enc_create.num_plugins].func = xvid_plugin_psnrhvsm;
+		plugins[xvid_enc_create.num_plugins].param = NULL;
+		xvid_enc_create.num_plugins++;
+	}
+
 #if 0
 	if (ARG_DEBUG) {
 		plugins[xvid_enc_create.num_plugins].func = rawenc_debug;
@@ -2472,6 +2487,9 @@
 	if (ARG_BVHQ) 
 		xvid_enc_frame.vop_flags |= XVID_VOP_RD_BVOP;
 
+	if (ARG_QMETRIC == 1)
+		xvid_enc_frame.vop_flags |= XVID_VOP_RD_PSNRHVSM;
+
 	switch (ARG_VHQMODE) /* this is the same code as for vfw */
 	{
 	case 1: /* VHQ_MODE_DECISION */