--- 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/12 00:06:49 1013 @@ -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.21 2003-05-12 00:06:49 edgomez Exp $ * ****************************************************************************/ @@ -50,36 +50,67 @@ /***************************************************************************** * 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, -}; -static xvid_vol_t const vol_presets[] = { - XVID_VOL_MPEGQUANT, - 0, - 0, - XVID_VOL_QUARTERPEL, - XVID_VOL_QUARTERPEL | XVID_VOL_GMC, - 0 + /* 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_vop_t const vop_presets[] = { + /* quality 0 */ + 0, + + /* quality 1 */ XVID_VOP_DYNAMIC_BFRAMES, - XVID_VOP_DYNAMIC_BFRAMES, + + /* quality 2 */ 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 3 */ + XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL | + XVID_VOP_INTER4V, + + /* quality 4 */ + XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL | + XVID_VOP_INTER4V, + + /* quality 5 */ + XVID_VOP_DYNAMIC_BFRAMES | XVID_VOP_HALFPEL | + XVID_VOP_INTER4V | XVID_VOP_TRELLISQUANT, + + /* quality 6 */ + XVID_VOP_DYNAMIC_BFRAMES | 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 @@ -96,7 +127,7 @@ 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 = 3; static float ARG_FRAMERATE = 25.00f; static int ARG_MAXFRAMENR = ABS_MAXFRAMENR; static char *ARG_INPUTFILE = NULL; @@ -174,6 +205,7 @@ double enctime; double totalenctime = 0.; + float totalPSNR[3] = {0., 0., 0.}; int totalsize; int result; @@ -195,6 +227,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 ****************************************************************************/ @@ -282,9 +320,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 +433,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, length= %7d", !result ? input_num : -1, key, (float) enctime, (int) m4v_size); if (stats_type > 0) { /* !XVID_TYPE_NOTHING */ @@ -417,7 +456,7 @@ break; } - printf(" | type=%s, quant=%2d, length=%7d", type, stats_quant, + 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))))) @@ -427,6 +466,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 +526,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"); /***************************************************************************** @@ -579,7 +630,7 @@ 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"); @@ -768,8 +819,8 @@ xvid_enc_create.num_plugins = 0; if (ARG_BITRATE) { - cbr.version = XVID_VERSION; memset(&cbr, 0, sizeof(xvid_plugin_cbr_t)); + cbr.version = XVID_VERSION; cbr.bitrate = ARG_BITRATE; plugins[xvid_enc_create.num_plugins].func = xvid_plugin_cbr; @@ -778,6 +829,7 @@ } if (ARG_QUANTI) { + memset(&rcfixed, 0, sizeof(xvid_plugin_fixed_t)); rcfixed.version = XVID_VERSION; /* We will use a 1/10 precision, just to make sure it works */ rcfixed.quant_base = 10; @@ -789,8 +841,8 @@ } 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; @@ -800,8 +852,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; @@ -914,7 +966,7 @@ } /* 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;