--- trunk/xvidcore/examples/xvid_stat.c	2002/09/27 18:35:35	548
+++ trunk/xvidcore/examples/xvid_stat.c	2002/11/27 21:09:10	684
@@ -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_stat.c,v 1.12 2002-09-27 18:35:35 edgomez Exp $
+ * $Id: xvid_stat.c,v 1.16 2002-11-27 21:09:10 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -112,25 +112,25 @@
  ****************************************************************************/
 
 static int const motion_presets[7] = {
-	0,                                                        // Q 0
-	PMV_EARLYSTOP16,                                          // Q 1
-	PMV_EARLYSTOP16,                                          // Q 2
-	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16,                    // Q 3
-	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16,                    // Q 4
-	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 |  // Q 5
+	0,                                                        /* Q 0 */
+	PMV_EARLYSTOP16,                                          /* Q 1 */
+	PMV_EARLYSTOP16,                                          /* Q 2 */
+	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16,                    /* Q 3 */
+	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16,                    /* Q 4 */
+	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 |  /* Q 5 */
 	PMV_HALFPELREFINE8,
-	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | // Q 6
+	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | /* Q 6 */
 	PMV_USESQUARES16 | PMV_EARLYSTOP8 | PMV_HALFPELREFINE8
 };
 
 static int const general_presets[7] = {
-	XVID_H263QUANT,	                              // Q 0
-	XVID_MPEGQUANT,                               // Q 1
-	XVID_H263QUANT,                               // Q 2
-	XVID_H263QUANT | XVID_HALFPEL,                // Q 3
-	XVID_H263QUANT | XVID_HALFPEL | XVID_INTER4V, // Q 4
-	XVID_H263QUANT | XVID_HALFPEL | XVID_INTER4V, // Q 5
-	XVID_H263QUANT | XVID_HALFPEL | XVID_INTER4V  // Q 6
+	XVID_H263QUANT,	                              /* Q 0 */
+	XVID_MPEGQUANT,                               /* Q 1 */
+	XVID_H263QUANT,                               /* Q 2 */
+	XVID_H263QUANT | XVID_HALFPEL,                /* Q 3 */
+	XVID_H263QUANT | XVID_HALFPEL | XVID_INTER4V, /* Q 4 */
+	XVID_H263QUANT | XVID_HALFPEL | XVID_INTER4V, /* Q 5 */
+	XVID_H263QUANT | XVID_HALFPEL | XVID_INTER4V  /* Q 6 */
 };
 		
 
@@ -198,7 +198,6 @@
   
 	double Ipsnr=0.,Imaxpsnr=0.,Iminpsnr=999.,Ivarpsnr=0.;
 	double Ppsnr=0.,Pmaxpsnr=0.,Pminpsnr=999.,Pvarpsnr=0.;
-	double Bpsnr=0.,Bmaxpsnr=0.,Bminpsnr=999.,Bvarpsnr=0.;
   
 	char filename[256];
   
@@ -277,10 +276,7 @@
  ****************************************************************************/
 
 	if (XDIM <= 0 || XDIM >= 2048 || YDIM <=0 || YDIM >= 2048 ) {
-		fprintf(stderr,
-				"Trying to retreive width and height from PGM header\n",
-				XDIM,
-				YDIM);
+		fprintf(stderr, "Trying to retreive width and height from PGM header\n");
 		ARG_INPUTTYPE = 1; /* pgm */
 	}
   
@@ -295,7 +291,7 @@
 	}
 
 	if ( ARG_FRAMERATE <= 0) {
-		fprintf(stderr,"Wrong Fraterate %s \n",argv[5]);
+		fprintf(stderr,"Wrong Framerate %s \n",argv[5]);
 		return -1;
 	}
 
@@ -366,9 +362,9 @@
 	do {
 
 		if (ARG_INPUTTYPE) 
-			status = read_pgmdata(in_file, in_buffer);	// read PGM data (YUV-format)
+			status = read_pgmdata(in_file, in_buffer);	/* read PGM data (YUV-format) */
 		else
-			status = read_yuvdata(in_file, in_buffer);	// read raw data (YUV-format)
+			status = read_yuvdata(in_file, in_buffer);	/* read raw data (YUV-format) */
 	      
 		if (status)
 		{
@@ -503,7 +499,7 @@
 	printf("Avg. Q%1d %2s ",ARG_QUALITY, (ARG_QUANTI ? " q" : "br"));
 	printf("%04d ",(ARG_QUANTI)?ARG_QUANTI:ARG_BITRATE);
 	printf("( %.2f bpp) ", (double)ARG_BITRATE*1000/XDIM/YDIM/ARG_FRAMERATE);
-	printf("size %6d ",totalsize);
+	printf("size %6d ", (int)totalsize);
 	printf("( %4d kbps ",(int)(totalsize*8*ARG_FRAMERATE/1000));
 	printf("/ %.2f bpp) ",(double)totalsize*8/XDIM/YDIM);
 	printf("enc: %6.1f fps, dec: %6.1f fps \n",1000/totalenctime, 1000/totaldectime);
@@ -558,7 +554,7 @@
 #ifndef _MSC_VER
 	struct timeval  tv;
 	gettimeofday(&tv, 0);
-	return tv.tv_sec*10e3 + tv.tv_usec * 1.0e-3;
+	return tv.tv_sec*1.0e3 + tv.tv_usec * 1.0e-3;
 #else
 	clock_t clk;
 	clk = clock();
@@ -829,14 +825,14 @@
 	XVID_ENC_STATS xstats;
 
 	xframe.bitstream = bitstream;
-	xframe.length = -1; 	// this is written by the routine
+	xframe.length = -1; 	/* this is written by the routine */
 
 	xframe.image = image;
-	xframe.colorspace = XVID_CSP_YV12;	// defined in <xvid.h>
+	xframe.colorspace = XVID_CSP_YV12;	/* defined in <xvid.h> */
 
-	xframe.intra = -1; // let the codec decide between I-frame (1) and P-frame (0)
+	xframe.intra = -1; /* let the codec decide between I-frame (1) and P-frame (0) */
 
-	xframe.quant = ARG_QUANTI;	// is quant != 0, use a fixed quant (and ignore bitrate)
+	xframe.quant = ARG_QUANTI;	/* is quant != 0, use a fixed quant (and ignore bitrate) */
 
 	xframe.motion = motion_presets[ARG_QUALITY];
 	xframe.general = general_presets[ARG_QUALITY];
@@ -898,7 +894,7 @@
 	xframe.length = m4v_size;
 	xframe.image = out_buffer;
 	xframe.stride = XDIM;
-	xframe.colorspace = XVID_CSP_YV12;             // XVID_CSP_USER is fastest (no memcopy involved)
+	xframe.colorspace = XVID_CSP_YV12;             /* XVID_CSP_USER is fastest (no memcopy involved) */
 
 	xerr = xvid_decore(dec_handle, XVID_DEC_DECODE, &xframe, NULL);