--- branches/dev-api-4/xvidcore/examples/xvid_encraw.c 2003/04/08 14:01:35 977 +++ branches/dev-api-4/xvidcore/examples/xvid_encraw.c 2003/05/17 13:26:51 1031 @@ -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.15 2003-04-08 14:01:35 suxen_drol Exp $ + * $Id: xvid_encraw.c,v 1.11.2.25 2003-05-17 13:21:26 suxen_drol Exp $ * ****************************************************************************/ @@ -50,41 +50,74 @@ /***************************************************************************** * Quality presets ****************************************************************************/ - static xvid_motion_t const motion_presets[] = { + /* quality 0 */ 0, - XVID_ME_HALFPELREFINE16, - XVID_ME_HALFPELREFINE16, - XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8, - XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8 | XVID_ME_EXTSEARCH16 | - XVID_ME_USESQUARES16, - XVID_ME_HALFPELREFINE16 | XVID_ME_HALFPELREFINE8 | XVID_ME_EXTSEARCH16 | - XVID_ME_USESQUARES16 | XVID_ME_CHROMA16 | XVID_ME_CHROMA8, + + /* quality 1 */ + XVID_ME_ADVANCEDDIAMOND16, + + /* quality 2 */ + XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16, + + /* quality 3 */ + XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 | + XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8, + + /* quality 4 */ + XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 | + XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 | + XVID_ME_CHROMA16 | XVID_ME_CHROMA8, + + /* quality 5 */ + XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 | + XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 | + XVID_ME_CHROMA16 | XVID_ME_CHROMA8, + + /* quality 6 */ + XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 | XVID_ME_EXTSEARCH16 | + XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 | XVID_ME_EXTSEARCH8 | + XVID_ME_CHROMA16 | XVID_ME_CHROMA8 , + }; +#define ME_ELEMENTS (sizeof(motion_presets)/sizeof(motion_presets[0])) -static xvid_vol_t const vol_presets[] = { - XVID_VOL_MPEGQUANT, +static xvid_vop_t const vop_presets[] = { + /* quality 0 */ 0, + + /* quality 1 */ 0, - XVID_VOL_QUARTERPEL, - XVID_VOL_QUARTERPEL | XVID_VOL_GMC, - 0 -}; -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_MODEDECISION_BITS + /* quality 2 */ + XVID_VOP_HALFPEL, + + /* quality 3 */ + XVID_VOP_HALFPEL | XVID_VOP_INTER4V, + + /* quality 4 */ + XVID_VOP_HALFPEL | XVID_VOP_INTER4V, + + /* quality 5 */ + XVID_VOP_HALFPEL | XVID_VOP_INTER4V | + XVID_VOP_TRELLISQUANT, + + /* quality 6 */ + XVID_VOP_HALFPEL | XVID_VOP_INTER4V | + XVID_VOP_TRELLISQUANT | XVID_VOP_HQACPRED, + }; +#define VOP_ELEMENTS (sizeof(vop_presets)/sizeof(vop_presets[0])) /***************************************************************************** * Command line global variables ****************************************************************************/ +#define MAX_ZONES 64 + +static xvid_enc_zone_t ZONES[MAX_ZONES]; +static int NUM_ZONES = 0; + /* Maximum number of frames to encode */ #define ABS_MAXFRAMENR 9999 @@ -92,13 +125,13 @@ static int ARG_DUMP = 0; static int ARG_LUMIMASKING = 0; static int ARG_BITRATE = 0; +static int ARG_SINGLE = 0; static char *ARG_PASS1 = 0; 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 = ME_ELEMENTS - 1; static float ARG_FRAMERATE = 25.00f; static int ARG_MAXFRAMENR = ABS_MAXFRAMENR; +static int ARG_MAXKEYINTERVAL = 0; static char *ARG_INPUTFILE = NULL; static int ARG_INPUTTYPE = 0; static int ARG_SAVEMPEGSTREAM = 0; @@ -110,6 +143,7 @@ static int ARG_MAXBFRAMES = 0; static int ARG_PACKED = 0; static int ARG_DEBUG = 0; +static int ARG_VOPDEBUG = 0; #define IMAGE_SIZE(x,y) ((x)*(y)*3/2) @@ -174,6 +208,7 @@ double enctime; double totalenctime = 0.; + float totalPSNR[3] = {0., 0., 0.}; int totalsize; int result; @@ -195,6 +230,12 @@ printf("xvid_encraw - raw mpeg4 bitstream encoder "); printf("written by Christoph Lampert 2002-2003\n\n"); + /* Is there a dumb XviD coder ? */ + if(ME_ELEMENTS != VOP_ELEMENTS) { + fprintf(stderr, "Presets' arrays should have the same number of elements -- Please fill a bug to xvid-devel@xvid.org\n"); + return(-1); + } + /***************************************************************************** * Command line parsing ****************************************************************************/ @@ -209,17 +250,17 @@ } else if (strcmp("-h", argv[i]) == 0 && i < argc - 1) { i++; YDIM = atoi(argv[i]); - } else if (strcmp("-bitrate", 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("-single", argv[i]) == 0) { + ARG_SINGLE = 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) { + } else if (strcmp("-pass2", argv[i]) == 0 && i < argc - 1) { i++; ARG_PASS2 = argv[i]; - i++; - ARG_PASS2_BITRATE = atoi(argv[i]); } else if (strcmp("-max_bframes", argv[i]) == 0 && i < argc - 1) { i++; ARG_MAXBFRAMES = atoi(argv[i]); @@ -231,12 +272,30 @@ } else if (strcmp("-bquant_offset", argv[i]) == 0 && i < argc - 1) { i++; ARG_BQOFFSET = atoi(argv[i]); + + } else if ((strcmp("-zq", argv[i]) == 0 || strcmp("-zw", argv[i]) == 0) && i < argc - 2) { + + if (NUM_ZONES >= MAX_ZONES) { + fprintf(stderr,"warning: too many zones; zone ignored\n"); + continue; + } + ZONES[NUM_ZONES].mode = strcmp("-zq", argv[i])==0 ? XVID_ZONE_QUANT : XVID_ZONE_WEIGHT; + i++; + ZONES[NUM_ZONES].frame = atoi(argv[i]); + i++; + ZONES[NUM_ZONES].increment = (int)(atof(argv[i]) * 100); + ZONES[NUM_ZONES].base = 100; + NUM_ZONES++; + } else if (strcmp("-quality", argv[i]) == 0 && i < argc - 1) { i++; ARG_QUALITY = atoi(argv[i]); } else if (strcmp("-framerate", argv[i]) == 0 && i < argc - 1) { i++; ARG_FRAMERATE = (float) atof(argv[i]); + } else if (strcmp("-max_key_interval", argv[i]) == 0 && i < argc - 1) { + i++; + ARG_MAXKEYINTERVAL = atoi(argv[i]); } else if (strcmp("-i", argv[i]) == 0 && i < argc - 1) { i++; ARG_INPUTFILE = argv[i]; @@ -252,16 +311,17 @@ } 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) { - i++; - ARG_QUANTI = (float) atof(argv[i]); } else if (strcmp("-save", argv[i]) == 0) { ARG_SAVEMPEGSTREAM = 1; } else if (strcmp("-debug", argv[i]) == 0) { - ARG_DEBUG = 1; + i++; + if (sscanf(argv[i],"0x%x", &ARG_DEBUG) || sscanf(argv[i],"%d", &ARG_DEBUG)) ; } else if (strcmp("-o", argv[i]) == 0 && i < argc - 1) { i++; ARG_OUTPUTFILE = argv[i]; + } else if (strcmp("-vop_debug", argv[i]) == 0) { + ARG_VOPDEBUG = 1; + } else if (strcmp("-help", argv[i])) { usage(); return (0); @@ -282,9 +342,10 @@ ARG_INPUTTYPE = 1; /* pgm */ } - if (ARG_QUALITY < 0 || ARG_QUALITY > 5) { - fprintf(stderr, "Wrong Quality\n"); - return (-1); + if (ARG_QUALITY < 0 ) { + ARG_QUALITY = 0; + } else if (ARG_QUALITY >= ME_ELEMENTS) { + ARG_QUALITY = ME_ELEMENTS - 1; } if (ARG_FRAMERATE <= 0) { @@ -394,7 +455,7 @@ /* Write the Frame statistics */ - printf("%5d: key=%i, time=%6.0f, length=%7d", !result ? input_num : -1, + printf("%5d: key=%i, time= %6.0f, len= %7d", !result ? input_num : -1, key, (float) enctime, (int) m4v_size); if (stats_type > 0) { /* !XVID_TYPE_NOTHING */ @@ -417,7 +478,7 @@ break; } - printf(" | type=%s, quant=%2d, length=%7d", type, stats_quant, + printf(" | type=%s, quant= %2d, len= %7d", type, stats_quant, stats_length); #define SSE2PSNR(sse, width, height) ((!(sse))?0.0f : 48.131f - 10*(float)log10((float)(sse)/((float)((width)*(height))))) @@ -427,6 +488,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 +548,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"); /***************************************************************************** @@ -571,20 +644,26 @@ fprintf(stderr, " -bquant_offset integer: bframe quantizer offset (default=100)\n"); fprintf(stderr, "\n"); fprintf(stderr, "Rate control options:\n"); - fprintf(stderr, " -framerate float : target framerate (>0 | default=25.0)\n"); - fprintf(stderr, " -bitrate integer : bitrate -- for CBR/VBR pass2\n"); - fprintf(stderr, " -quant float : quantizer -- for \"Fixed\" quantizer RC\n"); - fprintf(stderr, " -pass1 filename : output stats filename\n"); - fprintf(stderr, " -pass2 filename bitrate : input stats filename, target bitrate\n"); - fprintf(stderr, "\n"); + fprintf(stderr, " -framerate float : target framerate (>0 | default=25.0)\n"); + fprintf(stderr, " -bitrate integer : target bitrate\n"); + fprintf(stderr, " -single : single pass mode\n"); + fprintf(stderr, " -pass1 filename : twopass mode (first pass)\n"); + fprintf(stderr, " -pass2 filename : twopass mode (2nd pass)\n"); + fprintf(stderr, " -zq starting_frame float : bitrate zone; quant\n"); + fprintf(stderr, " -zw starting_frame float : bitrate zone; weight\n"); + fprintf(stderr, " -max_key_interval integer : maximum keyframe interval\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, " -quality integer: quality ([0..%d])\n", ME_ELEMENTS - 1); 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 dquants\n"); fprintf(stderr, " -help : prints this help message\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "NB: You can define %d zones repeating the -z[qw] option as many times as needed.\n", MAX_ZONES); + fprintf(stderr, "\n"); } /***************************************************************************** @@ -718,10 +797,11 @@ enc_init(int use_assembler) { int xerr; - xvid_plugin_cbr_t cbr; + //xvid_plugin_cbr_t cbr; + xvid_plugin_single_t single; xvid_plugin_2pass1_t rc2pass1; xvid_plugin_2pass2_t rc2pass2; - xvid_plugin_fixed_t rcfixed; + //xvid_plugin_fixed_t rcfixed; xvid_enc_plugin_t plugins[7]; xvid_gbl_init_t xvid_gbl_init; xvid_enc_create_t xvid_enc_create; @@ -733,6 +813,8 @@ /* Set version -- version checking will done by xvidcore */ memset(&xvid_gbl_init, 0, sizeof(xvid_gbl_init)); xvid_gbl_init.version = XVID_VERSION; + printf("0x%x\n", ARG_DEBUG); + xvid_gbl_init.debug = ARG_DEBUG; /* Do we have to enable ASM optimizations ? */ @@ -763,36 +845,27 @@ xvid_enc_create.height = YDIM; /* init plugins */ + xvid_enc_create.zones = ZONES; + xvid_enc_create.num_zones = NUM_ZONES; 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; + if (ARG_SINGLE) { + memset(&single, 0, sizeof(xvid_plugin_single_t)); + single.version = XVID_VERSION; + single.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_QUANTI) { - rcfixed.version = XVID_VERSION; - /* We will use a 1/10 precision, just to make sure it works */ - rcfixed.quant_base = 10; - rcfixed.quant_increment = (int) (ARG_QUANTI * 10); - - plugins[xvid_enc_create.num_plugins].func = xvid_plugin_fixed; - plugins[xvid_enc_create.num_plugins].param = &rcfixed; + plugins[xvid_enc_create.num_plugins].func = xvid_plugin_single; + plugins[xvid_enc_create.num_plugins].param = &single; xvid_enc_create.num_plugins++; } if (ARG_PASS2) { - rc2pass2.version = XVID_VERSION; memset(&rc2pass2, 0, sizeof(xvid_plugin_2pass2_t)); + rc2pass2.version = XVID_VERSION; rc2pass2.filename = ARG_PASS2; - rc2pass2.bitrate = ARG_PASS2_BITRATE; + rc2pass2.bitrate = ARG_BITRATE; plugins[xvid_enc_create.num_plugins].func = xvid_plugin_2pass2; plugins[xvid_enc_create.num_plugins].param = &rc2pass2; @@ -800,8 +873,8 @@ } if (ARG_PASS1) { - rc2pass1.version = XVID_VERSION; memset(&rc2pass1, 0, sizeof(xvid_plugin_2pass1_t)); + rc2pass1.version = XVID_VERSION; rc2pass1.filename = ARG_PASS1; plugins[xvid_enc_create.num_plugins].func = xvid_plugin_2pass1; @@ -821,11 +894,11 @@ xvid_enc_create.num_plugins++; } - if (ARG_DEBUG) { + /* 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; @@ -840,7 +913,12 @@ } /* Maximum key frame interval */ - xvid_enc_create.max_key_interval = (int) ARG_FRAMERATE *10; + + if (ARG_MAXKEYINTERVAL > 0) { + xvid_enc_create.max_key_interval = ARG_MAXKEYINTERVAL; + }else { + xvid_enc_create.max_key_interval = (int) ARG_FRAMERATE *10; + } /* Bframes settings */ xvid_enc_create.max_bframes = ARG_MAXBFRAMES; @@ -914,12 +992,15 @@ } /* Set up core's general features */ - xvid_enc_frame.vol_flags = vol_presets[ARG_QUALITY]; + xvid_enc_frame.vol_flags = 0; if (ARG_STATS) xvid_enc_frame.vol_flags |= XVID_VOL_EXTRASTATS; /* Set up core's general features */ xvid_enc_frame.vop_flags = vop_presets[ARG_QUALITY]; + if (ARG_VOPDEBUG) { + xvid_enc_frame.vop_flags |= XVID_VOP_DEBUG; + } /* Frame type -- let core decide for us */ xvid_enc_frame.type = XVID_TYPE_AUTO;