--- branches/dev-api-4/xvidcore/examples/xvid_encraw.c 2003/03/11 23:39:47 918 +++ branches/dev-api-4/xvidcore/examples/xvid_encraw.c 2003/03/16 12:05:09 926 @@ -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.4 2003-03-11 23:39:47 edgomez Exp $ + * $Id: xvid_encraw.c,v 1.11.2.8 2003-03-16 12:04:13 suxen_drol Exp $ * ****************************************************************************/ @@ -46,6 +46,7 @@ #include "xvid.h" + /***************************************************************************** * Quality presets ****************************************************************************/ @@ -85,6 +86,8 @@ #define ABS_MAXFRAMENR 9999 static int ARG_STATS = 0; +static int ARG_DUMP = 0; +static int ARG_LUMIMASKING = 0; static int ARG_BITRATE = 900; static int ARG_QUANTI = 0; static int ARG_QUALITY = 5; @@ -101,6 +104,7 @@ static int ARG_BQRATIO = 150; static int ARG_BQOFFSET = 100; static int ARG_MAXBFRAMES = 0; +static int ARG_PACKED = 0; #define IMAGE_SIZE(x,y) ((x)*(y)*3/2) #define MAX(A,B) ( ((A)>(B)) ? (A) : (B) ) @@ -113,7 +117,7 @@ * Nasty global vars ;-) ***************************************************************************/ -static int i,filenr = 0; +static int i; /* the path where to save output */ static char filepath[256] = "./"; @@ -141,7 +145,10 @@ static int enc_stop(); static int enc_main(unsigned char* image, unsigned char* bitstream, - long *frametype, + int *key, + int *stats_type, + int *stats_quant, + int *stats_length, int stats[3]); /***************************************************************************** @@ -158,12 +165,17 @@ double enctime; double totalenctime=0.; - long totalsize; - int status; - long frame_type; - - long m4v_size; + 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]; @@ -198,6 +210,9 @@ i++; ARG_MAXBFRAMES = atoi(argv[i]); } + else if (strcmp("-p", argv[i]) == 0) { + ARG_PACKED = 1; + } else if (strcmp("-bqr", argv[i]) == 0 && i < argc - 1 ) { i++; ARG_BQRATIO = atoi(argv[i]); @@ -221,6 +236,12 @@ else if (strcmp("-s", 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("-t", argv[i]) == 0 && i < argc - 1 ) { i++; ARG_INPUTTYPE = atoi(argv[i]); @@ -314,10 +335,10 @@ ****************************************************************************/ - status = enc_init(use_assembler); - if (status) + result = enc_init(use_assembler); + if (result) { - fprintf(stderr, "Encore INIT problem, return value %d\n", status); + fprintf(stderr, "Encore INIT problem, return value %d\n", result); goto release_all; } @@ -343,72 +364,85 @@ totalsize = 0; + result = 0; + + input_num = 0; /* input frame counter */ + output_num = 0; /* output frame counter */ + do { char *type; int stats[3]; - if(ARG_INPUTTYPE) { - /* read PGM data (YUV-format) */ - status = read_pgmdata(in_file, in_buffer); - } else { - /* read raw data (YUV-format) */ - status = read_yuvdata(in_file, in_buffer); - } - - if(status) { - /* Couldn't read image, most likely end-of-file */ - continue; - } + 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); + } + } /***************************************************************************** * Encode and decode this frame ****************************************************************************/ enctime = msecond(); - m4v_size = enc_main(in_buffer, mp4_buffer, &frame_type, stats); + m4v_size = enc_main(!result?in_buffer:0, mp4_buffer, &key, &stats_type, &stats_quant, &stats_length, stats); enctime = msecond() - enctime; - /* Not coded frames return 0 */ - if(m4v_size == 0) goto next_frame; - /* Write the Frame statistics */ - switch(frame_type) { - case XVID_TYPE_IVOP: - type = "I"; - break; - case XVID_TYPE_PVOP: - type = "P"; - break; - case XVID_TYPE_BVOP: - type = "B"; - break; - case XVID_TYPE_SVOP: - type = "S"; - break; - case XVID_TYPE_NOTHING: - type = "N"; - break; - default: - type = "U"; - break; - } - - printf("Frame %5d: type = %s, enctime(ms) =%6.1f, length(bytes) =%7d", - (int)filenr, - type, + + printf("%5d: key=%i, time(ms)=%6.1f, length=%7d", + !result?input_num:-1, + key, (float)enctime, (int)m4v_size); - if(ARG_STATS) { - printf(", psnr y = %2.2f, psnr u = %2.2f, psnr v = %2.2f", - (stats[0] == 0)? 0.0f: 48.131f - 10*(float)log10((float)stats[0]/((float)(XDIM)*(YDIM))), - (stats[1] == 0)? 0.0f: 48.131f - 10*(float)log10((float)stats[1]/((float)(XDIM)*(YDIM)/4)), - (stats[2] == 0)? 0.0f: 48.131f - 10*(float)log10((float)stats[2]/((float)(XDIM)*(YDIM)/4))); + if (stats_type > 0) { /* !XVID_TYPE_NOTHING */ + + switch(stats_type) { + case XVID_TYPE_IVOP: + type = "I"; + break; + case XVID_TYPE_PVOP: + type = "P"; + break; + case XVID_TYPE_BVOP: + type = "B"; + break; + case XVID_TYPE_SVOP: + type = "S"; + break; + default: + type = "U"; + break; + } + + printf(" | type=%s quant=%2d, length=%7d", type, stats_quant, stats_length); + + if(ARG_STATS) { + printf(", psnr y = %2.2f, psnr u = %2.2f, psnr v = %2.2f", + (stats[0] == 0)? 0.0f: 48.131f - 10*(float)log10((float)stats[0]/((float)(XDIM)*(YDIM))), + (stats[1] == 0)? 0.0f: 48.131f - 10*(float)log10((float)stats[1]/((float)(XDIM)*(YDIM)/4)), + (stats[2] == 0)? 0.0f: 48.131f - 10*(float)log10((float)stats[2]/((float)(XDIM)*(YDIM)/4))); + } + } printf("\n"); + if (m4v_size < 0) { + break; + } + /* Update encoding time stats */ totalenctime += enctime; totalsize += m4v_size; @@ -417,15 +451,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; + output_num++; } else { @@ -435,14 +470,13 @@ } } - filenr++; + input_num++; - next_frame: /* Read the header if it's pgm stream */ - if (ARG_INPUTTYPE) - status = read_pgmheader(in_file); + if (!result && ARG_INPUTTYPE) + result = read_pgmheader(in_file); - } while ( (!status) && (filenr 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); @@ -465,9 +507,9 @@ if (enc_handle) { - status = enc_stop(); - if (status) - fprintf(stderr, "Encore RELEASE problem return value %d\n", status); + result = enc_stop(); + if (result) + fprintf(stderr, "Encore RELEASE problem return value %d\n", result); } if(in_file) @@ -520,6 +562,7 @@ 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, " -p : packed mode\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"); @@ -528,7 +571,7 @@ 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, " -dump : save decoder output\n"); fprintf(stderr, " -m : save mpeg4 raw stream\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"); @@ -616,13 +659,53 @@ * 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; jmb_height; j++) { + for (i = 0; imb_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) { int xerr; - + + xvid_enc_plugin_t plugins[2]; + xvid_gbl_init_t xvid_gbl_init; xvid_enc_create_t xvid_enc_create; @@ -631,7 +714,9 @@ *----------------------------------------------------------------------*/ /* 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) { @@ -654,12 +739,34 @@ *----------------------------------------------------------------------*/ /* 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_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++; + } + +/* 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; @@ -684,7 +791,9 @@ xvid_enc_create.frame_drop_ratio = 0; /* Global encoder options */ - xvid_enc_create.global = (ARG_STATS)?XVID_EXTRASTATS_ENABLE:0; + 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); @@ -707,30 +816,40 @@ static int enc_main(unsigned char* image, unsigned char* bitstream, - long *frametype, + int * key, + int *stats_type, + int *stats_quant, + int *stats_length, int stats[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]; @@ -740,7 +859,6 @@ /* Force the right quantizer */ xvid_enc_frame.quant = ARG_QUANTI; - xvid_enc_frame.bquant = 0; /* Set up motion estimation flags */ xvid_enc_frame.motion = motion_presets[ARG_QUALITY]; @@ -749,19 +867,16 @@ xvid_enc_frame.quant_intra_matrix = NULL; xvid_enc_frame.quant_inter_matrix = NULL; - /* Foll proof */ - xvid_enc_stats[0].sse_y = 0; - xvid_enc_stats[0].sse_v = 0; - xvid_enc_stats[0].sse_u = 0; - /* Encode the frame */ - xvid_enc_frame.vop_flags |= (ARG_STATS)?XVID_EXTRASTATS:0; ret = xvid_encore(enc_handle, XVID_ENC_ENCODE, &xvid_enc_frame, &xvid_enc_stats); - *frametype = xvid_enc_stats[0].type; - stats[0] = xvid_enc_stats[0].sse_y; - stats[1] = xvid_enc_stats[0].sse_u; - stats[2] = xvid_enc_stats[0].sse_v; + *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; + stats[0] = xvid_enc_stats.sse_y; + stats[1] = xvid_enc_stats.sse_u; + stats[2] = xvid_enc_stats.sse_v; return(ret); }