--- xvid_stat.c	2002/09/21 09:29:36	1.9
+++ xvid_stat.c	2002/09/28 14:27:15	1.14
@@ -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.9 2002/09/21 09:29:36 edgomez Exp $
+ * $Id: xvid_stat.c,v 1.14 2002/09/28 14:27:15 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -44,7 +44,7 @@
  *  -q integer     : quality ([0..5])
  *  -d boolean     : save decoder output (0 False*, !=0 True)
  *  -m boolean     : save mpeg4 raw stream (0 False*, !=0 True)
- *  -h, -help      : prints this help message
+ *  -help          : prints this help message
  *  -quant integer : fixed quantizer (disables -b setting)
  *  (* means default)
  *
@@ -65,9 +65,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#ifndef _MSC_VER
+#include <sys/time.h>
+#else
 #include <time.h>
+#endif
 
-#include "../src/xvid.h"
+#include "xvid.h"
 
 /****************************************************************************
  *                               Prototypes
@@ -126,7 +130,7 @@
 	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 | XVID_LUMIMASKING  // Q 6
+	XVID_H263QUANT | XVID_HALFPEL | XVID_INTER4V  // Q 6
 };
 		
 
@@ -257,7 +261,7 @@
 			i++;
 			ARG_SAVEMPEGSTREAM = atoi(argv[i]);
 		}
-		else if (strcmp("-h", argv[i]) == 0 || strcmp("-help", argv[i])) {
+		else if (strcmp("-help", argv[i])) {
 			usage();
 			return(0);
 		}
@@ -273,10 +277,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 */
 	}
   
@@ -291,7 +292,7 @@
 	}
 
 	if ( ARG_FRAMERATE <= 0) {
-		fprintf(stderr,"Wrong Fraterate %s \n",argv[5]);
+		fprintf(stderr,"Wrong Framerate %s \n",argv[5]);
 		return -1;
 	}
 
@@ -502,7 +503,7 @@
 	printf("size %6d ",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",1/totalenctime, 1/totaldectime);
+	printf("enc: %6.1f fps, dec: %6.1f fps \n",1000/totalenctime, 1000/totaldectime);
 	printf("PSNR P(%d): %5.2f ( %5.2f , %5.2f ; %5.4f ) ",Pframes,Ppsnr,Pminpsnr,Pmaxpsnr,sqrt(Pvarpsnr/filenr));
 	printf("I(%d): %5.2f ( %5.2f , %5.2f ; %5.4f ) ",Iframes,Ipsnr,Iminpsnr,Imaxpsnr,sqrt(Ivarpsnr/filenr));
 	printf("\n");
@@ -551,12 +552,15 @@
 /* Return time elapsed time in miliseconds since the program started */
 static double msecond()
 {	
+#ifndef _MSC_VER
+	struct timeval  tv;
+	gettimeofday(&tv, 0);
+	return tv.tv_sec*1.0e3 + tv.tv_usec * 1.0e-3;
+#else
 	clock_t clk;
-	   
 	clk = clock();
-			
 	return clk * 1000 / CLOCKS_PER_SEC;
-
+#endif
 }
 
 
@@ -628,7 +632,7 @@
 	fprintf(stderr, " -q integer     : quality ([0..5])\n");
 	fprintf(stderr, " -d boolean     : save decoder output (0 False*, !=0 True)\n");
 	fprintf(stderr, " -m boolean     : save mpeg4 raw stream (0 False*, !=0 True)\n");
-	fprintf(stderr, " -h, -help      : prints this help message\n");
+	fprintf(stderr, " -help          : prints this help message\n");
 	fprintf(stderr, " -quant integer : fixed quantizer (disables -b setting)\n");
 	fprintf(stderr, " (* means default)\n");
 
@@ -701,7 +705,7 @@
 static int read_yuvdata(FILE* handle, unsigned char *image)
 {
    
-	if (fread(image, 1, IMAGE_SIZE(XDIM, YDIM), handle) != IMAGE_SIZE(XDIM, YDIM)) 
+	if (fread(image, 1, IMAGE_SIZE(XDIM, YDIM), handle) != (unsigned int)IMAGE_SIZE(XDIM, YDIM)) 
 		return 1;
 	else	
 		return 0;