--- branches/dev-api-4/xvidcore/examples/xvid_encraw.c	2003/03/09 00:28:09	909
+++ branches/dev-api-4/xvidcore/examples/xvid_encraw.c	2003/03/25 11:01:48	942
@@ -19,15 +19,15 @@
  *  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.1 2003-03-09 00:28:09 edgomez Exp $
+ * $Id: xvid_encraw.c,v 1.11.2.12 2003-03-25 11:01:48 suxen_drol Exp $
  *
  ****************************************************************************/
 
 /*****************************************************************************
  *  Application notes :
  *		                    
- *  A sequence of YUV pics in PGM file format is encoded and decoded
- *  The speed is measured and PSNR of decoded picture is calculated. 
+ *  A sequence of raw YUV I420 pics or YUV I420 PGM file format is encoded
+ *  The speed is measured and frames' PSNR are taken from core. 
  *		                   
  *  The program is plain C and needs no libraries except for libxvidcore, 
  *  and maths-lib.
@@ -46,6 +46,7 @@
 
 #include "xvid.h"
 
+
 /*****************************************************************************
  *                            Quality presets
  ****************************************************************************/
@@ -56,7 +57,7 @@
 	PMV_HALFPELREFINE16,
 	PMV_HALFPELREFINE16 | PMV_HALFPELREFINE8,
 	PMV_HALFPELREFINE16 | PMV_HALFPELREFINE8 | PMV_EXTSEARCH16 | PMV_USESQUARES16,
-	PMV_HALFPELREFINE16 | PMV_HALFPELREFINE8 | PMV_EXTSEARCH16 | PMV_USESQUARES16,
+	PMV_HALFPELREFINE16 | PMV_HALFPELREFINE8 | PMV_EXTSEARCH16 | PMV_USESQUARES16 | PMV_CHROMA16 | PMV_CHROMA8,
 };
 
 static xvid_vol_t const vol_presets[] = {
@@ -65,7 +66,7 @@
 	0,
 	XVID_QUARTERPEL,
 	XVID_QUARTERPEL | XVID_GMC,
-	XVID_QUARTERPEL | XVID_GMC
+	0
 };
 
 static xvid_vop_t const vop_presets[] = {
@@ -74,7 +75,7 @@
 	XVID_DYNAMIC_BFRAMES | XVID_HALFPEL,
 	XVID_DYNAMIC_BFRAMES | XVID_HALFPEL | XVID_INTER4V,
 	XVID_DYNAMIC_BFRAMES | XVID_HALFPEL | XVID_INTER4V | XVID_HQACPRED,
-	XVID_DYNAMIC_BFRAMES | XVID_HALFPEL | XVID_INTER4V | XVID_HQACPRED | XVID_MODEDECISION_BITS
+	XVID_DYNAMIC_BFRAMES | XVID_HALFPEL | XVID_HQACPRED | XVID_MODEDECISION_BITS
 };
 
 /*****************************************************************************
@@ -84,22 +85,28 @@
 /* Maximum number of frames to encode */
 #define ABS_MAXFRAMENR 9999
 
-static int   ARG_BITRATE = 900;
-static int   ARG_QUANTI = 0;
-static int   ARG_QUALITY = 5;
-static int   ARG_MINQUANT = 1;
-static int   ARG_MAXQUANT = 31;
+static int ARG_STATS = 0;
+static int ARG_DUMP = 0;
+static int ARG_LUMIMASKING = 0;
+static int ARG_BITRATE = 0;
+static char * ARG_PASS1 = 0;
+static char * ARG_PASS2 = 0;
+static int ARG_QUANTI = 0;
+static int ARG_QUALITY = 5;
 static float ARG_FRAMERATE = 25.00f;
-static int   ARG_MAXFRAMENR = ABS_MAXFRAMENR;
+static int ARG_MAXFRAMENR = ABS_MAXFRAMENR;
 static char *ARG_INPUTFILE = NULL;
-static int   ARG_INPUTTYPE = 0;
-static int   ARG_SAVEMPEGSTREAM = 0;
+static int ARG_INPUTTYPE = 0;
+static int ARG_SAVEMPEGSTREAM = 0;
 static char *ARG_OUTPUTFILE = NULL;
-static int   XDIM = 0;
-static int   YDIM = 0;
-static int   ARG_BQRATIO = 150;
-static int   ARG_BQOFFSET = 100;
-static int   ARG_MAXBFRAMES = 0;
+static int XDIM = 0;
+static int YDIM = 0;
+static int ARG_BQRATIO = 150;
+static int ARG_BQOFFSET = 100;
+static int ARG_MAXBFRAMES = 0;
+static int ARG_PACKED = 0;
+static int ARG_DEBUG = 0;
+
 #define IMAGE_SIZE(x,y) ((x)*(y)*3/2)
 
 #define MAX(A,B) ( ((A)>(B)) ? (A) : (B) )
@@ -112,7 +119,7 @@
  *                     Nasty global vars ;-)
  ***************************************************************************/
 
-static int i,filenr = 0;
+static int i;
 
 /* the path where to save output */
 static char filepath[256] = "./";
@@ -131,22 +138,30 @@
 static double msecond();
 
 /* PGM related functions */
-static int read_pgmheader(FILE* handle);
-static int read_pgmdata(FILE* handle, unsigned char *image);
-static int read_yuvdata(FILE* handle, unsigned char *image);
+static int read_pgmheader(FILE * handle);
+static int read_pgmdata(FILE * handle,
+						unsigned char *image);
+static int read_yuvdata(FILE * handle,
+						unsigned char *image);
 
 /* Encoder related functions */
 static int enc_init(int use_assembler);
 static int enc_stop();
-static int enc_main(unsigned char* image,
-					unsigned char* bitstream,
-					long *frametype);
+static int enc_main(unsigned char *image,
+					unsigned char *bitstream,
+					int *key,
+					int *stats_type,
+					int *stats_quant,
+					int *stats_length,
+					int stats[3]);
 
 /*****************************************************************************
  *               Main function
  ****************************************************************************/
 
-int main(int argc, char *argv[])
+int
+main(int argc,
+	 char *argv[])
 {
 
 	unsigned char *mp4_buffer = NULL;
@@ -154,17 +169,22 @@
 	unsigned char *out_buffer = NULL;
 
 	double enctime;
-	double totalenctime=0.;
-  
-	long totalsize;
-	int status;
-	long frame_type;
-  
-	long m4v_size;
-	int use_assembler=0;
-  
+	double totalenctime = 0.;
+
+	int totalsize;
+	int result;
+	int m4v_size;
+	int key;
+	int stats_type;
+	int stats_quant;
+	int stats_length;
+	int use_assembler = 0;
+
+	int input_num;
+	int output_num;
+
 	char filename[256];
-  
+
 	FILE *in_file = stdin;
 	FILE *out_file = NULL;
 
@@ -175,145 +195,141 @@
  *                            Command line parsing
  ****************************************************************************/
 
-	for (i=1; i< argc; i++) {
- 
-		if (strcmp("-asm", argv[i]) == 0 ) {
+	for (i = 1; i < argc; i++) {
+
+		if (strcmp("-asm", argv[i]) == 0) {
 			use_assembler = 1;
-		}
-		else if (strcmp("-w", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-w", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			XDIM = atoi(argv[i]);
-		}
-		else if (strcmp("-h", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-h", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			YDIM = atoi(argv[i]);
-		}
-		else if (strcmp("-b", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-bitrate", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_BITRATE = atoi(argv[i]);
-		}
-		else if (strcmp("-bn", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-pass1", argv[i]) == 0 && i < argc - 1) {
+			i++;
+			ARG_PASS1 = argv[i];
+		} else if (strcmp("-pass2", argv[i]) == 0 && i < argc - 2) {
+			i++;
+			ARG_PASS1 = argv[i];
+            i++;
+            ARG_PASS2 = argv[i];
+		} else if (strcmp("-max_bframes", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_MAXBFRAMES = atoi(argv[i]);
-		}
-		else if (strcmp("-bqr", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-packed", argv[i]) == 0) {
+			ARG_PACKED = 1;
+		} else if (strcmp("-bquant_ratio", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_BQRATIO = atoi(argv[i]);
-		}
-		else if (strcmp("-bqo", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-bquant_offset", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_BQOFFSET = atoi(argv[i]);
-		}
-		else if (strcmp("-q", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-quality", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_QUALITY = atoi(argv[i]);
-		}
-		else if (strcmp("-f", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-framerate", argv[i]) == 0 && i < argc - 1) {
 			i++;
-			ARG_FRAMERATE = (float)atof(argv[i]);
-		}
-		else if (strcmp("-i", argv[i]) == 0 && i < argc - 1 ) {
+			ARG_FRAMERATE = (float) atof(argv[i]);
+		} else if (strcmp("-i", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_INPUTFILE = argv[i];
-		}
-		else if (strcmp("-t", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-stats", argv[i]) == 0) {
+			ARG_STATS = 1;
+		} else if (strcmp("-dump", argv[i]) == 0) {
+			ARG_DUMP = 1;
+		} else if (strcmp("-lumimasking", argv[i]) == 0) {
+			ARG_LUMIMASKING = 1;
+		} else if (strcmp("-type", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_INPUTTYPE = atoi(argv[i]);
-		}
-		else if(strcmp("-n", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-nframes", argv[i]) == 0 && i < argc - 1) {
 			i++;
-			ARG_MAXFRAMENR  = atoi(argv[i]);
-		}
-		else if (strcmp("-quant", argv[i]) == 0 && i < argc - 1 ) {
+			ARG_MAXFRAMENR = atoi(argv[i]);
+		} else if (strcmp("-quant", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_QUANTI = atoi(argv[i]);
-		}
-		else if (strcmp("-m", argv[i]) == 0 && i < argc - 1 ) {
-			i++;
-			ARG_SAVEMPEGSTREAM = atoi(argv[i]);
-		}
-		else if (strcmp("-o", argv[i]) == 0 && i < argc - 1 ) {
+		} else if (strcmp("-save", argv[i]) == 0) {
+			ARG_SAVEMPEGSTREAM = 1;
+		} else if (strcmp("-debug", argv[i]) == 0) {
+			ARG_DEBUG = 1;
+		} else if (strcmp("-o", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_OUTPUTFILE = argv[i];
-		}
-		else if (strcmp("-help", argv[i])) {
+		} else if (strcmp("-help", argv[i])) {
 			usage();
-			return(0);
-		}
-		else {
+			return (0);
+		} else {
 			usage();
 			exit(-1);
 		}
-										
+
 	}
-								
+
 /*****************************************************************************
  *                            Arguments checking
  ****************************************************************************/
 
-	if (XDIM <= 0 || XDIM >= 2048 || YDIM <=0 || YDIM >= 2048 ) {
-		fprintf(stderr,	"Trying to retreive width and height from PGM header\n");
-		ARG_INPUTTYPE = 1; /* pgm */
-	}
-  
-	if ( ARG_QUALITY < 0 || ARG_QUALITY > 5) {
-		fprintf(stderr,"Wrong Quality\n");
-		return(-1);
+	if (XDIM <= 0 || XDIM >= 2048 || YDIM <= 0 || YDIM >= 2048) {
+		fprintf(stderr,
+				"Trying to retreive width and height from PGM header\n");
+		ARG_INPUTTYPE = 1;		/* pgm */
 	}
 
-	if ( ARG_BITRATE <= 0 && ARG_QUANTI == 0) {
-		fprintf(stderr,"Wrong Bitrate\n");
-		return(-1);
+	if (ARG_QUALITY < 0 || ARG_QUALITY > 5) {
+		fprintf(stderr, "Wrong Quality\n");
+		return (-1);
 	}
 
-	if ( ARG_FRAMERATE <= 0) {
-		fprintf(stderr,"Wrong Framerate %s \n",argv[5]);
-		return(-1);
+	if (ARG_FRAMERATE <= 0) {
+		fprintf(stderr, "Wrong Framerate %s \n", argv[5]);
+		return (-1);
 	}
 
-	if ( ARG_MAXFRAMENR <= 0) {
-		fprintf(stderr,"Wrong number of frames\n");
-		return(-1);
+	if (ARG_MAXFRAMENR <= 0) {
+		fprintf(stderr, "Wrong number of frames\n");
+		return (-1);
 	}
 
-	if ( ARG_INPUTFILE == NULL || strcmp(ARG_INPUTFILE, "stdin") == 0) {
+	if (ARG_INPUTFILE == NULL || strcmp(ARG_INPUTFILE, "stdin") == 0) {
 		in_file = stdin;
-	}
-	else {
+	} else {
 
 		in_file = fopen(ARG_INPUTFILE, "rb");
 		if (in_file == NULL) {
 			fprintf(stderr, "Error opening input file %s\n", ARG_INPUTFILE);
-			return(-1);
+			return (-1);
 		}
 	}
 
 	if (ARG_INPUTTYPE) {
 		if (read_pgmheader(in_file)) {
-			fprintf(stderr, "Wrong input format, I want YUV encapsulated in PGM\n");
-			return(-1);
+			fprintf(stderr,
+					"Wrong input format, I want YUV encapsulated in PGM\n");
+			return (-1);
 		}
 	}
 
 	/* now we know the sizes, so allocate memory */
-	in_buffer = (unsigned char *) malloc(IMAGE_SIZE(XDIM,YDIM));
+	in_buffer = (unsigned char *) malloc(IMAGE_SIZE(XDIM, YDIM));
 	if (!in_buffer)
 		goto free_all_memory;
 
 	/* this should really be enough memory ! */
-	mp4_buffer = (unsigned char *) malloc(IMAGE_SIZE(XDIM,YDIM)*2);
+	mp4_buffer = (unsigned char *) malloc(IMAGE_SIZE(XDIM, YDIM) * 2);
 	if (!mp4_buffer)
-		goto free_all_memory;	
+		goto free_all_memory;
 
 /*****************************************************************************
  *                            XviD PART  Start
  ****************************************************************************/
 
 
-	status = enc_init(use_assembler);
-	if (status)    
-	{ 
-		fprintf(stderr, "Encore INIT problem, return value %d\n", status);
+	result = enc_init(use_assembler);
+	if (result) {
+		fprintf(stderr, "Encore INIT problem, return value %d\n", result);
 		goto release_all;
 	}
 
@@ -323,13 +339,12 @@
 
 	if (ARG_SAVEMPEGSTREAM && ARG_OUTPUTFILE) {
 
-		if((out_file = fopen(ARG_OUTPUTFILE, "w+b")) == NULL) {
+		if ((out_file = fopen(ARG_OUTPUTFILE, "w+b")) == NULL) {
 			fprintf(stderr, "Error opening output file %s\n", ARG_OUTPUTFILE);
 			goto release_all;
 		}
 
-	}
-	else {
+	} else {
 		out_file = NULL;
 	}
 
@@ -339,17 +354,28 @@
 
 	totalsize = 0;
 
+	result = 0;
+
+	input_num = 0;				/* input frame counter */
+	output_num = 0;				/* output frame counter */
+
 	do {
 
-		if (ARG_INPUTTYPE)
-			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) */
-	      
-		if (status)
-		{
-			/* Couldn't read image, most likely end-of-file */
-			continue;
+		char *type;
+		int sse[3];
+
+		if (input_num >= ARG_MAXFRAMENR) {
+			result = 1;
+		}
+
+		if (!result) {
+			if (ARG_INPUTTYPE) {
+				/* read PGM data (YUV-format) */
+				result = read_pgmdata(in_file, in_buffer);
+			} else {
+				/* read raw data (YUV-format) */
+				result = read_yuvdata(in_file, in_buffer);
+			}
 		}
 
 /*****************************************************************************
@@ -357,16 +383,22 @@
  ****************************************************************************/
 
 		enctime = msecond();
-		m4v_size = enc_main(in_buffer, mp4_buffer, &frame_type);
+		m4v_size =
+			enc_main(!result ? in_buffer : 0, mp4_buffer, &key, &stats_type,
+					 &stats_quant, &stats_length, sse);
 		enctime = msecond() - enctime;
 
-		/* Not coded frames return 0 */
-		if(m4v_size == 0) goto next_frame;
+		/* Write the Frame statistics */
 
-		{
-			char *type;
+		printf("%5d: key=%i, time=%6.0f, length=%7d",
+			   !result ? input_num : -1,
+			   key,
+			   (float) enctime,
+			   (int) m4v_size);
+
+		if (stats_type > 0) {	/* !XVID_TYPE_NOTHING */
 
-			switch(frame_type) {
+			switch (stats_type) {
 			case XVID_TYPE_IVOP:
 				type = "I";
 				break;
@@ -380,13 +412,30 @@
 				type = "S";
 				break;
 			default:
-				type = "Unknown";
+				type = "U";
 				break;
-			}		
+			}
+
+			printf(" | type=%s, quant=%2d, length=%7d", type, stats_quant,
+				   stats_length);
+
+#define SSE2PSNR(sse, width, height) ((!(sse))?0.0f : 48.131f - 10*(float)log10((float)(sse)/((float)((width)*(height)))))
+
+			if (ARG_STATS) {
+				printf(", psnr y = %2.2f, psnr u = %2.2f, psnr v = %2.2f",
+					   SSE2PSNR(sse[0], XDIM, YDIM),
+					   SSE2PSNR(sse[1], XDIM/2, YDIM/2),
+					   SSE2PSNR(sse[2], XDIM/2, YDIM/2));
+			}
+
+		}
 
-			printf("Frame %5d: type = %s, enctime(ms) =%6.1f, length(bytes) =%7d\n",
-				   (int)filenr, type, (float)enctime, (int)m4v_size);
+#undef SSE2PSNR
 
+		printf("\n");
+
+		if (m4v_size < 0) {
+			break;
 		}
 
 		/* Update encoding time stats */
@@ -397,17 +446,16 @@
  *                       Save stream to file
  ****************************************************************************/
 
-		if (ARG_SAVEMPEGSTREAM)
-		{
+		if (m4v_size > 0 && ARG_SAVEMPEGSTREAM) {
 			/* Save single files */
 			if (out_file == NULL) {
-				sprintf(filename, "%sframe%05d.m4v", filepath, filenr);
+				sprintf(filename, "%sframe%05d.m4v", filepath, output_num);
 				out_file = fopen(filename, "wb");
 				fwrite(mp4_buffer, m4v_size, 1, out_file);
 				fclose(out_file);
 				out_file = NULL;
-			}
-			else {
+				output_num++;
+			} else {
 
 				/* Write mp4 data */
 				fwrite(mp4_buffer, 1, m4v_size, out_file);
@@ -415,51 +463,59 @@
 			}
 		}
 
-	next_frame:
-		/* Read the header if it's pgm stream */ 
-		if (ARG_INPUTTYPE)
-			status = read_pgmheader(in_file);
+		input_num++;
+
+		/* Read the header if it's pgm stream */
+		if (!result && ARG_INPUTTYPE)
+			result = read_pgmheader(in_file);
+
+	} while (1);
 
-		if(frame_type != 5) filenr++;
 
-	} while ( (!status) && (filenr<ARG_MAXFRAMENR) );
 
-	
-      
 /*****************************************************************************
  *         Calculate totals and averages for output, print results
  ****************************************************************************/
 
-	totalsize    /= filenr;
-	totalenctime /= filenr;
+	printf("Tot: enctime(ms) =%7.2f,               length(bytes) = %7d\n",
+		   totalenctime, (int) totalsize);
+
+	if (input_num > 0) {
+		totalsize /= input_num;
+		totalenctime /= input_num;
+	} else {
+		totalsize = -1;
+		totalenctime = -1;
+	}
 
 	printf("Avg: enctime(ms) =%7.2f, fps =%7.2f, length(bytes) = %7d\n",
-		   totalenctime, 1000/totalenctime, (int)totalsize);
+		   totalenctime, 1000 / totalenctime, (int) totalsize);
+
 
 /*****************************************************************************
  *                            XviD PART  Stop
  ****************************************************************************/
 
- release_all:
+  release_all:
 
-	if (enc_handle)
-	{	
-		status = enc_stop();
-		if (status)    
-			fprintf(stderr, "Encore RELEASE problem return value %d\n", status);
+	if (enc_handle) {
+		result = enc_stop();
+		if (result)
+			fprintf(stderr, "Encore RELEASE problem return value %d\n",
+					result);
 	}
 
-	if(in_file)
+	if (in_file)
 		fclose(in_file);
-	if(out_file)
+	if (out_file)
 		fclose(out_file);
 
- free_all_memory:
+  free_all_memory:
 	free(out_buffer);
 	free(mp4_buffer);
 	free(in_buffer);
 
-	return(0);
+	return (0);
 
 }
 
@@ -473,16 +529,19 @@
  *****************************************************************************/
 
 /* Return time elapsed time in miliseconds since the program started */
-static double msecond()
-{	
+static double
+msecond()
+{
 #ifndef WIN32
-	struct timeval  tv;
+	struct timeval tv;
+
 	gettimeofday(&tv, 0);
-	return(tv.tv_sec*1.0e3 + tv.tv_usec * 1.0e-3);
+	return (tv.tv_sec * 1.0e3 + tv.tv_usec * 1.0e-3);
 #else
 	clock_t clk;
+
 	clk = clock();
-	return(clk * 1000 / CLOCKS_PER_SEC);
+	return (clk * 1000 / CLOCKS_PER_SEC);
 #endif
 }
 
@@ -490,31 +549,40 @@
  *                             Usage message
  *****************************************************************************/
 
-static void usage()
+static void
+usage()
 {
-
-	fprintf(stderr, "Usage : xvid_stat [OPTIONS]\n");
-	fprintf(stderr, "Options :\n");
-	fprintf(stderr, " -w integer     : frame width ([1.2048])\n");
-	fprintf(stderr, " -h integer     : frame height ([1.2048])\n");
-	fprintf(stderr, " -b integer     : target bitrate (>0 | default=900kbit)\n");
-	fprintf(stderr, " -bn integer    : max bframes (default=0)\n");
-	fprintf(stderr, " -bqr integer   : bframe quantizer ratio (default=150)\n");
-	fprintf(stderr, " -bqo integer   : bframe quantizer offset (default=100)\n");
-	fprintf(stderr, " -f float       : target framerate (>0)\n");
-	fprintf(stderr, " -i string      : input filename (default=stdin)\n");
-	fprintf(stderr, " -t integer     : input data type (yuv=0, pgm=1)\n");
-	fprintf(stderr, " -n integer     : number of frames to encode\n");
-	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, " -o string      : output container filename (only usefull when -m 1 is used) :\n");
-	fprintf(stderr, "                  When this option is not used : one file per encoded frame\n");
-	fprintf(stderr, "                  When this option is used : save to 'string' file\n");
-	fprintf(stderr, " -help          : prints this help message\n");
-	fprintf(stderr, " -quant integer : fixed quantizer (disables -b setting)\n");
-	fprintf(stderr, " (* means default)\n");
-
+	fprintf(stderr, "Usage : xvid_stat [OPTIONS]\n\n");
+	fprintf(stderr, "Input options:\n");
+	fprintf(stderr, " -i       string : input filename (default=stdin)\n");
+	fprintf(stderr, " -type    integer: input data type (yuv=0, pgm=1)\n");
+	fprintf(stderr, " -w       integer: frame width ([1.2048])\n");
+	fprintf(stderr, " -h       integer: frame height ([1.2048])\n");
+	fprintf(stderr, " -nframes integer: number of frames to encode\n");
+	fprintf(stderr, "\n");
+	fprintf(stderr, "Output options:\n");
+	fprintf(stderr, " -dump    : save decoder output\n");
+	fprintf(stderr, " -save    : save mpeg4 raw stream\n");
+	fprintf(stderr,	" -o string: output filename\n");
+	fprintf(stderr, "\n");
+	fprintf(stderr, "Bitrate options:\n");
+	fprintf(stderr,	" -bitrate       integer: target bitrate (>0 | default=900kbit)\n");
+	fprintf(stderr,	" -quant         integer: fixed quantizer (disables -b setting)\n");
+	fprintf(stderr, " -max_bframes   integer: max bframes (default=0)\n");
+	fprintf(stderr,	" -bquant_ratio  integer: bframe quantizer ratio (default=150)\n");
+	fprintf(stderr,	" -bquant_offset integer: bframe quantizer offset (default=100)\n");
+	fprintf(stderr, " -framerate     float  : target framerate (>0)\n");
+    fprintf(stderr,	" -pass1 filename      : stats filename\n");
+    fprintf(stderr,	" -pass2 filename1 filename2    : stats amd scaled-stats filename\n");
+	fprintf(stderr, "\n");
+	fprintf(stderr, "Other options\n");
+	fprintf(stderr, " -asm            : use assembly optmized code\n");
+	fprintf(stderr, " -quality integer: quality ([0..5])\n");
+	fprintf(stderr, " -packed         : packed mode\n");
+	fprintf(stderr, " -lumimasking    : use lumimasking algorithm\n");
+	fprintf(stderr, " -stats          : print stats about encoded frames\n");
+	fprintf(stderr, " -debug          : print all MB quantizers\n");
+	fprintf(stderr, " -help           : prints this help message\n");
 }
 
 /*****************************************************************************
@@ -525,102 +593,154 @@
  *
  *****************************************************************************/
 
-static int read_pgmheader(FILE* handle)
-{	
-	int bytes,xsize,ysize,depth;
+static int
+read_pgmheader(FILE * handle)
+{
+	int bytes, xsize, ysize, depth;
 	char dummy[2];
-	
-	bytes = fread(dummy,1,2,handle);
 
-	if ( (bytes < 2) || (dummy[0] != 'P') || (dummy[1] != '5' ))
-   		return(1);
+	bytes = fread(dummy, 1, 2, handle);
 
-	fscanf(handle,"%d %d %d",&xsize,&ysize,&depth); 
-	if ( (xsize > 1440) || (ysize > 2880 ) || (depth != 255) )
-	{
-		fprintf(stderr,"%d %d %d\n",xsize,ysize,depth);
-	   	return(2);
+	if ((bytes < 2) || (dummy[0] != 'P') || (dummy[1] != '5'))
+		return (1);
+
+	fscanf(handle, "%d %d %d", &xsize, &ysize, &depth);
+	if ((xsize > 1440) || (ysize > 2880) || (depth != 255)) {
+		fprintf(stderr, "%d %d %d\n", xsize, ysize, depth);
+		return (2);
 	}
-	if ( (XDIM==0) || (YDIM==0) )
-	{
-		XDIM=xsize;
-		YDIM=ysize*2/3;
+	if ((XDIM == 0) || (YDIM == 0)) {
+		XDIM = xsize;
+		YDIM = ysize * 2 / 3;
 	}
 
-	return(0);
+	return (0);
 }
 
-static int read_pgmdata(FILE* handle, unsigned char *image)
-{	
+static int
+read_pgmdata(FILE * handle,
+			 unsigned char *image)
+{
 	int i;
 	char dummy;
-	
+
 	unsigned char *y = image;
-	unsigned char *u = image + XDIM*YDIM;
-	unsigned char *v = image + XDIM*YDIM + XDIM/2*YDIM/2; 
+	unsigned char *u = image + XDIM * YDIM;
+	unsigned char *v = image + XDIM * YDIM + XDIM / 2 * YDIM / 2;
 
 	/* read Y component of picture */
-	fread(y, 1, XDIM*YDIM, handle);
- 
-	for (i=0;i<YDIM/2;i++)
-	{
+	fread(y, 1, XDIM * YDIM, handle);
+
+	for (i = 0; i < YDIM / 2; i++) {
 		/* read U */
-		fread(u, 1, XDIM/2, handle);
+		fread(u, 1, XDIM / 2, handle);
 
 		/* read V */
-		fread(v, 1, XDIM/2, handle);
+		fread(v, 1, XDIM / 2, handle);
 
 		/* Update pointers */
-		u += XDIM/2;
-		v += XDIM/2;
+		u += XDIM / 2;
+		v += XDIM / 2;
 	}
 
-    /*  I don't know why, but this seems needed */
+	/*  I don't know why, but this seems needed */
 	fread(&dummy, 1, 1, handle);
 
-	return(0);
+	return (0);
 }
 
-static int read_yuvdata(FILE* handle, unsigned char *image)
+static int
+read_yuvdata(FILE * handle,
+			 unsigned char *image)
 {
-   
-	if (fread(image, 1, IMAGE_SIZE(XDIM, YDIM), handle) != (unsigned int)IMAGE_SIZE(XDIM, YDIM)) 
-		return(1);
-	else	
-		return(0);
+
+	if (fread(image, 1, IMAGE_SIZE(XDIM, YDIM), handle) !=
+		(unsigned int) IMAGE_SIZE(XDIM, YDIM))
+		return (1);
+	else
+		return (0);
 }
 
 /*****************************************************************************
  *     Routines for encoding: init encoder, frame step, release encoder
  ****************************************************************************/
 
+/* sample plugin */
+
+int
+rawenc_debug(void *handle,
+			 int opt,
+			 void *param1,
+			 void *param2)
+{
+	switch (opt) {
+	case XVID_PLG_INFO:
+		{
+			xvid_plg_info_t *info = (xvid_plg_info_t *) param1;
+
+			info->flags = XVID_REQDQUANTS;
+			return 0;
+		}
+
+	case XVID_PLG_CREATE:
+	case XVID_PLG_DESTROY:
+	case XVID_PLG_BEFORE:
+		return 0;
+
+	case XVID_PLG_AFTER:
+		{
+			xvid_plg_data_t *data = (xvid_plg_data_t *) param1;
+			int i, j;
+
+			printf("---[ frame: %5i   quant: %2i   length: %6i ]---\n",
+				   data->frame_num, data->quant, data->length);
+			for (j = 0; j < data->mb_height; j++) {
+				for (i = 0; i < data->mb_width; i++)
+					printf("%2i ", data->dquant[j * data->dquant_stride + i]);
+				printf("\n");
+			}
+
+			return 0;
+		}
+	}
+
+	return XVID_ERR_FAIL;
+}
+
+
 #define FRAMERATE_INCR 1001
 
+
 /* Initialize encoder for first use, pass all needed parameters to the codec */
-static int enc_init(int use_assembler)
+static int
+enc_init(int use_assembler)
 {
 	int xerr;
-	
-	xvid_gbl_init_t   xvid_gbl_init;
+    xvid_plugin_cbr_t cbr;
+    xvid_plugin_2pass1_t rc2pass1;
+    xvid_plugin_2pass2_t rc2pass2;
+    xvid_enc_plugin_t plugins[6];
+	xvid_gbl_init_t xvid_gbl_init;
 	xvid_enc_create_t xvid_enc_create;
 
 	/*------------------------------------------------------------------------
 	 * XviD core initialization
 	 *----------------------------------------------------------------------*/
 
-	/* Set version -- version checking will done by xvidcore*/
+	/* Set version -- version checking will done by xvidcore */
+	memset(&xvid_gbl_init, 0, sizeof(xvid_gbl_init));
 	xvid_gbl_init.version = XVID_VERSION;
-	
+
+
 	/* Do we have to enable ASM optimizations ? */
-	if(use_assembler) {
+	if (use_assembler) {
 
 #ifdef ARCH_IS_IA64
 		xvid_gbl_init.cpu_flags = XVID_CPU_FORCE | XVID_CPU_IA64;
 #else
 		xvid_gbl_init.cpu_flags = 0;
 #endif
-	}
-	else {
+	} else {
 		xvid_gbl_init.cpu_flags = XVID_CPU_FORCE;
 	}
 
@@ -632,37 +752,93 @@
 	 *----------------------------------------------------------------------*/
 
 	/* Version again */
+	memset(&xvid_enc_create, 0, sizeof(xvid_enc_create));
 	xvid_enc_create.version = XVID_VERSION;
 
 	/* Width and Height of input frames */
 	xvid_enc_create.width = XDIM;
 	xvid_enc_create.height = YDIM;
 
+	/* init plugins  */
+
+	xvid_enc_create.plugins = plugins;
+	xvid_enc_create.num_plugins = 0;
+
+    if (ARG_BITRATE) {
+        cbr.version = XVID_VERSION;
+        memset(&cbr, 0, sizeof(xvid_plugin_cbr_t));
+        cbr.bitrate = ARG_BITRATE;
+
+        plugins[xvid_enc_create.num_plugins].func = xvid_plugin_cbr;
+		plugins[xvid_enc_create.num_plugins].param = &cbr;
+		xvid_enc_create.num_plugins++;
+    }
+
+    if (ARG_PASS1 && ARG_PASS2) {
+        rc2pass2.version = XVID_VERSION;
+        memset(&rc2pass2, 0, sizeof(xvid_plugin_2pass2_t));
+        rc2pass2.filename1 = ARG_PASS1;
+        rc2pass2.filename2 = ARG_PASS2;
+
+        plugins[xvid_enc_create.num_plugins].func = xvid_plugin_2pass2;
+		plugins[xvid_enc_create.num_plugins].param = &rc2pass2;
+		xvid_enc_create.num_plugins++;
+    } else if (ARG_PASS1) {
+        rc2pass1.version = XVID_VERSION;
+        memset(&rc2pass1, 0, sizeof(xvid_plugin_2pass1_t));
+        rc2pass1.filename = ARG_PASS1;
+
+        plugins[xvid_enc_create.num_plugins].func = xvid_plugin_2pass1;
+		plugins[xvid_enc_create.num_plugins].param = &rc2pass1;
+		xvid_enc_create.num_plugins++;
+    }
+
+
+    if (ARG_LUMIMASKING) {
+		plugins[xvid_enc_create.num_plugins].func = xvid_plugin_lumimasking;
+		plugins[xvid_enc_create.num_plugins].param = NULL;
+		xvid_enc_create.num_plugins++;
+	}
+
+	if (ARG_DUMP) {
+		plugins[xvid_enc_create.num_plugins].func = xvid_plugin_dump;
+		plugins[xvid_enc_create.num_plugins].param = NULL;
+		xvid_enc_create.num_plugins++;
+	}
+
+	if (ARG_DEBUG) {
+		plugins[xvid_enc_create.num_plugins].func = rawenc_debug;
+		plugins[xvid_enc_create.num_plugins].param = NULL;
+		xvid_enc_create.num_plugins++;
+	}
+
 	/* No fancy thread tests */
 	xvid_enc_create.num_threads = 0;
 
 	/* Frame rate - Do some quick float fps = fincr/fbase hack */
-	if ((ARG_FRAMERATE - (int)ARG_FRAMERATE) < SMALL_EPS) {
+	if ((ARG_FRAMERATE - (int) ARG_FRAMERATE) < SMALL_EPS) {
 		xvid_enc_create.fincr = 1;
-		xvid_enc_create.fbase = (int)ARG_FRAMERATE;
+		xvid_enc_create.fbase = (int) ARG_FRAMERATE;
 	} else {
 		xvid_enc_create.fincr = FRAMERATE_INCR;
-		xvid_enc_create.fbase = (int)(FRAMERATE_INCR * ARG_FRAMERATE);
+		xvid_enc_create.fbase = (int) (FRAMERATE_INCR * ARG_FRAMERATE);
 	}
 
 	/* Maximum key frame interval */
-	xvid_enc_create.max_key_interval = (int)ARG_FRAMERATE*10;
+	xvid_enc_create.max_key_interval = (int) ARG_FRAMERATE *10;
 
 	/* Bframes settings */
 	xvid_enc_create.max_bframes = ARG_MAXBFRAMES;
 	xvid_enc_create.bquant_ratio = ARG_BQRATIO;
-	xvid_enc_create.bquant_offset = ARG_BQOFFSET;	
+	xvid_enc_create.bquant_offset = ARG_BQOFFSET;
 
 	/* Dropping ratio frame -- we don't need that */
 	xvid_enc_create.frame_drop_ratio = 0;
 
 	/* Global encoder options */
 	xvid_enc_create.global = 0;
+	if (ARG_PACKED)	xvid_enc_create.global |=XVID_PACKED;
+	if (ARG_STATS)  xvid_enc_create.global |=XVID_EXTRASTATS_ENABLE;
 
 	/* I use a small value here, since will not encode whole movies, but short clips */
 	xerr = xvid_encore(NULL, XVID_ENC_CREATE, &xvid_enc_create, NULL);
@@ -670,55 +846,68 @@
 	/* Retrieve the encoder instance from the structure */
 	enc_handle = xvid_enc_create.handle;
 
-	return(xerr);
+	return (xerr);
 }
 
-static int enc_stop()
+static int
+enc_stop()
 {
 	int xerr;
 
 	/* Destroy the encoder instance */
 	xerr = xvid_encore(enc_handle, XVID_ENC_DESTROY, NULL, NULL);
 
-	return(xerr);
+	return (xerr);
 }
 
-static int enc_main(unsigned char* image,
-					unsigned char* bitstream,
-					long *frametype)
+static int
+enc_main(unsigned char *image,
+		 unsigned char *bitstream,
+		 int *key,
+		 int *stats_type,
+		 int *stats_quant,
+		 int *stats_length,
+		 int sse[3])
 {
 	int ret;
 
 	xvid_enc_frame_t xvid_enc_frame;
-	xvid_enc_stats_t xvid_enc_stats[2];
+	xvid_enc_stats_t xvid_enc_stats;
 
 	/* Version for the frame and the stats */
+	memset(&xvid_enc_frame, 0, sizeof(xvid_enc_frame));
 	xvid_enc_frame.version = XVID_VERSION;
-	xvid_enc_stats[0].version = XVID_VERSION;
-	xvid_enc_stats[1].version = XVID_VERSION;		
+
+	memset(&xvid_enc_stats, 0, sizeof(xvid_enc_stats));
+	xvid_enc_stats.version = XVID_VERSION;
 
 	/* Bind output buffer */
 	xvid_enc_frame.bitstream = bitstream;
 	xvid_enc_frame.length = -1;
 
 	/* Initialize input image fields */
-	xvid_enc_frame.input.plane[0]  = image;
-	xvid_enc_frame.input.csp       = XVID_CSP_I420;
-	xvid_enc_frame.input.stride[0] = XDIM;
+	if (image) {
+		xvid_enc_frame.input.plane[0] = image;
+		xvid_enc_frame.input.csp = XVID_CSP_I420;
+		xvid_enc_frame.input.stride[0] = XDIM;
+	} else {
+		xvid_enc_frame.input.csp = XVID_CSP_NULL;
+	}
 
 	/* Set up core's general features */
 	xvid_enc_frame.vol_flags = vol_presets[ARG_QUALITY];
+	if (ARG_STATS)
+		xvid_enc_frame.vol_flags |= XVID_EXTRASTATS;
 
 	/* Set up core's general features */
 	xvid_enc_frame.vop_flags = vop_presets[ARG_QUALITY];
 
 	/* Frame type -- let core decide for us */
-	xvid_enc_frame.type   = XVID_TYPE_AUTO;
+	xvid_enc_frame.type = XVID_TYPE_AUTO;
 
 	/* Force the right quantizer */
-	xvid_enc_frame.quant  = ARG_QUANTI;
-	xvid_enc_frame.bquant = 0;
-	
+	xvid_enc_frame.quant = ARG_QUANTI;
+
 	/* Set up motion estimation flags */
 	xvid_enc_frame.motion = motion_presets[ARG_QUALITY];
 
@@ -726,9 +915,18 @@
 	xvid_enc_frame.quant_intra_matrix = NULL;
 	xvid_enc_frame.quant_inter_matrix = NULL;
 
-	ret = xvid_encore(enc_handle, XVID_ENC_ENCODE, &xvid_enc_frame, &xvid_enc_stats);
-
-	*frametype = xvid_enc_stats[0].type;
+	/* Encode the frame */
+	ret =
+		xvid_encore(enc_handle, XVID_ENC_ENCODE, &xvid_enc_frame,
+					&xvid_enc_stats);
+
+	*key = (xvid_enc_frame.out_flags & XVID_KEYFRAME);
+	*stats_type = xvid_enc_stats.type;
+	*stats_quant = xvid_enc_stats.quant;
+	*stats_length = xvid_enc_stats.length;
+	sse[0] = xvid_enc_stats.sse_y;
+	sse[1] = xvid_enc_stats.sse_u;
+	sse[2] = xvid_enc_stats.sse_v;
 
-	return(ret);
+	return (ret);
 }