--- trunk/xvidcore/examples/xvid_encraw.c 2003/02/15 08:39:17 850 +++ trunk/xvidcore/examples/xvid_encraw.c 2003/02/15 15:22:19 851 @@ -3,7 +3,7 @@ * XVID MPEG-4 VIDEO CODEC * - Console based test application - * - * Copyright(C) 2002 Christoph Lampert + * Copyright(C) 2002-2003 Christoph Lampert * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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.9 2003-02-11 21:56:31 edgomez Exp $ + * $Id: xvid_encraw.c,v 1.10 2003-02-15 15:22:17 edgomez Exp $ * ****************************************************************************/ @@ -38,7 +38,7 @@ #include #include #include -#ifndef _MSC_VER +#ifndef WIN32 #include #else #include @@ -96,19 +96,18 @@ static char *ARG_INPUTFILE = NULL; static int ARG_INPUTTYPE = 0; static int ARG_SAVEMPEGSTREAM = 0; -static int ARG_OUTPUTTYPE = 0; static char *ARG_OUTPUTFILE = NULL; static int ARG_HINTMODE = HINT_MODE_NONE; static int XDIM = 0; static int YDIM = 0; +static int ARG_BQRATIO = 120; +static int ARG_BQOFFSET = 0; +static int ARG_MAXBFRAMES = 0; #define IMAGE_SIZE(x,y) ((x)*(y)*3/2) #define MAX(A,B) ( ((A)>(B)) ? (A) : (B) ) #define SMALL_EPS 1e-10 -#define LONG_PACK(a,b,c,d) ((long) (((long)(a))<<24) | (((long)(b))<<16) | \ - (((long)(c))<<8) |((long)(d))) - #define SWAP(a) ( (((a)&0x000000ff)<<24) | (((a)&0x0000ff00)<<8) | \ (((a)&0x00ff0000)>>8) | (((a)&0xff000000)>>24) ) @@ -177,7 +176,7 @@ FILE *hints_file = NULL; printf("xvid_encraw - raw mpeg4 bitstream encoder "); - printf("written by Christoph Lampert 2002\n\n"); + printf("written by Christoph Lampert 2002-2003\n\n"); /***************************************************************************** * Command line parsing @@ -200,6 +199,18 @@ i++; ARG_BITRATE = atoi(argv[i]); } + else if (strcmp("-bn", argv[i]) == 0 && i < argc - 1 ) { + i++; + ARG_MAXBFRAMES = atoi(argv[i]); + } + else if (strcmp("-bqr", argv[i]) == 0 && i < argc - 1 ) { + i++; + ARG_BQRATIO = atoi(argv[i]); + } + else if (strcmp("-bqo", argv[i]) == 0 && i < argc - 1 ) { + i++; + ARG_BQOFFSET = atoi(argv[i]); + } else if (strcmp("-q", argv[i]) == 0 && i < argc - 1 ) { i++; ARG_QUALITY = atoi(argv[i]); @@ -228,10 +239,6 @@ i++; ARG_SAVEMPEGSTREAM = atoi(argv[i]); } - else if (strcmp("-mt", argv[i]) == 0 && i < argc - 1 ) { - i++; - ARG_OUTPUTTYPE = atoi(argv[i]); - } else if (strcmp("-mv", argv[i]) == 0 && i < argc - 1 ) { i++; ARG_HINTMODE = atoi(argv[i]); @@ -331,7 +338,6 @@ } /* now we know the sizes, so allocate memory */ - in_buffer = (unsigned char *) malloc(IMAGE_SIZE(XDIM,YDIM)); if (!in_buffer) goto free_all_memory; @@ -357,35 +363,13 @@ * Main loop ****************************************************************************/ - totalsize = LONG_PACK('M','P','4','U'); - if(*((char *)(&totalsize)) == 'M') - bigendian = 1; - else - bigendian = 0; - - if (ARG_SAVEMPEGSTREAM && (ARG_OUTPUTTYPE || ARG_OUTPUTFILE)) { - - if (ARG_OUTPUTFILE == NULL && ARG_OUTPUTTYPE) - ARG_OUTPUTFILE = "stream.mp4u"; - else if(ARG_OUTPUTFILE == NULL && !ARG_OUTPUTTYPE) - ARG_OUTPUTFILE = "stream.m4v"; + if (ARG_SAVEMPEGSTREAM && ARG_OUTPUTFILE) { if((out_file = fopen(ARG_OUTPUTFILE, "w+b")) == NULL) { fprintf(stderr, "Error opening output file %s\n", ARG_OUTPUTFILE); goto release_all; } - /* Write header */ - if (ARG_OUTPUTTYPE) { - - long test = LONG_PACK('M','P','4','U'); - - test = (!bigendian)?SWAP(test):test; - - fwrite(&test, sizeof(test), 1, out_file); - - } - } else { out_file = NULL; @@ -429,12 +413,23 @@ &m4v_size, &frame_type, &hints_size); enctime = msecond() - enctime; + /* if it's a not coded VOP (aka NVOP) then we write nothing */ + if(frame_type == 5) goto next_frame; + + { + char *type[] = {"P", "I", "B", "S", "Packed", "N", "Unknown"}; + + if(frame_type<0 || frame_type>5) frame_type = 6; + + printf("Frame %5d: type = %s, enctime(ms) =%6.1f, length(bytes) =%7d\n", + (int)filenr, type[frame_type], (float)enctime, (int)m4v_size); + + } + + /* Update encoding time stats */ totalenctime += enctime; totalsize += m4v_size; - printf("Frame %5d: intra %1d, enctime=%6.1f ms, size=%6dbytes\n", - (int)filenr, (int)frame_type, (float)enctime, (int)m4v_size); - /***************************************************************************** * Save hints to file ****************************************************************************/ @@ -461,24 +456,19 @@ out_file = NULL; } else { - /* Using mp4u container */ - if (ARG_OUTPUTTYPE) { - long size = m4v_size; - size = (!bigendian)?SWAP(size):size; - fwrite(&size, sizeof(size), 1, out_file); - } /* Write mp4 data */ - fwrite(mp4_buffer, m4v_size, 1, out_file); + fwrite(mp4_buffer, 1, m4v_size, out_file); } } + next_frame: /* Read the header if it's pgm stream */ if (ARG_INPUTTYPE) status = read_pgmheader(in_file); - filenr++; + if(frame_type != 5) filenr++; } while ( (!status) && (filenr0 | default=900kbit)\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 :\n"); - fprintf(stderr, " + stream.m4v with -mt 0\n"); - fprintf(stderr, " + stream.mp4u with -mt 1\n"); + fprintf(stderr, " When this option is used : save to 'string' (default=stream.m4v)\n"); fprintf(stderr, " -mt integer : output type (m4v=0, mp4u=1)\n"); fprintf(stderr, " -mv integer : Use motion vector hints (no hints=0, get hints=1, set hints=2)\n"); fprintf(stderr, " -help : prints this help message\n"); @@ -699,6 +691,11 @@ xparam.min_quantizer = ARG_MINQUANT; xparam.max_quantizer = ARG_MAXQUANT; xparam.max_key_interval = (int)ARG_FRAMERATE*10; + xparam.bquant_ratio = ARG_BQRATIO; + xparam.bquant_offset = ARG_BQOFFSET; + xparam.max_bframes = ARG_MAXBFRAMES; + xparam.frame_drop_ratio = 0; + xparam.global = 0; /* I use a small value here, since will not encode whole movies, but short clips */ @@ -735,10 +732,12 @@ xframe.intra = -1; /* let the codec decide between I-frame (1) and P-frame (0) */ xframe.quant = ARG_QUANTI; /* is quant != 0, use a fixed quant (and ignore bitrate) */ - + xframe.bquant = 0; + xframe.motion = motion_presets[ARG_QUALITY]; xframe.general = general_presets[ARG_QUALITY]; xframe.quant_intra_matrix = xframe.quant_inter_matrix = NULL; + xframe.stride = XDIM; xframe.hint.hintstream = hints_buffer;