--- trunk/xvidcore/examples/xvid_encraw.c 2010/11/28 15:19:07 1909 +++ trunk/xvidcore/examples/xvid_encraw.c 2014/02/07 16:00:50 2070 @@ -22,7 +22,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.45 2010-11-28 15:19:07 Isibaar Exp $ + * $Id$ * ****************************************************************************/ @@ -200,7 +200,7 @@ static char *ARG_PASS2 = 0; //static int ARG_QUALITY = ME_ELEMENTS - 1; static int ARG_QUALITY = 6; -static float ARG_FRAMERATE = 25.00f; +static float ARG_FRAMERATE = 0.f; static int ARG_DWRATE = 25; static int ARG_DWSCALE = 1; static int ARG_MAXFRAMENR = ABS_MAXFRAMENR; @@ -257,6 +257,7 @@ static int ARG_VBVMAXRATE = 0; static int ARG_VBVPEAKRATE = 0; static int ARG_THREADS = 0; +static int ARG_SLICES = 1; static int ARG_VFR = 0; static int ARG_PROGRESS = 0; static int ARG_COLORSPACE = XVID_CSP_YV12; @@ -352,7 +353,7 @@ /* 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"); + fprintf(stderr, "Presets' arrays should have the same number of elements -- Please file a bug to xvid-devel@xvid.org\n"); return(-1); } @@ -447,6 +448,9 @@ } else if (strcmp("-threads", argv[i]) == 0 && i < argc -1) { i++; ARG_THREADS = atoi(argv[i]); + } else if (strcmp("-slices", argv[i]) == 0 && i < argc -1) { + i++; + ARG_SLICES = atoi(argv[i]); } else if (strcmp("-bquant_ratio", argv[i]) == 0 && i < argc - 1) { i++; ARG_BQRATIO = atoi(argv[i]); @@ -481,7 +485,7 @@ memset(&ZONES[NUM_ZONES], 0, sizeof(zone_t)); ZONES[NUM_ZONES].frame = startframe; - ZONES[NUM_ZONES].modifier = atof(options)*100; + ZONES[NUM_ZONES].modifier = (int)(atof(options)*100); if (toupper(c)=='Q') ZONES[NUM_ZONES].mode = XVID_ZONE_QUANT; else if (toupper(c)=='W') @@ -494,7 +498,7 @@ if ((frameoptions=strchr(options, ','))!=NULL) { int readchar=0, count; frameoptions++; - while (readchar= (unsigned int)(stop_num-1) && ARG_MAXBFRAMES) { + if ((unsigned int)(input_num+start_num) >= (unsigned int)(stop_num-1) && ARG_MAXBFRAMES) { stats_type = XVID_TYPE_PVOP; } else @@ -1827,7 +1830,9 @@ #ifdef XVID_AVI_OUTPUT fprintf(stderr, " -avi string: save an AVI file for the complete sequence\n"); #endif +#ifdef XVID_MKV_OUTPUT fprintf(stderr, " -mkv string: save a MKV file for the complete sequence\n"); +#endif fprintf(stderr, "\n"); fprintf(stderr, "BFrames options:\n"); fprintf(stderr, " -max_bframes integer: max bframes (2)\n"); @@ -1835,9 +1840,9 @@ fprintf(stderr, " -bquant_offset integer: bframe quantizer offset (100)\n"); fprintf(stderr, "\n"); fprintf(stderr, "Rate control options:\n"); - fprintf(stderr, " -framerate float : target framerate (25.0)\n"); + fprintf(stderr, " -framerate float : target framerate (auto)\n"); fprintf(stderr, " -bitrate [integer] : target bitrate in kbps (700)\n"); - fprintf(stderr, " -size integer : target size in kilobytes\n"); + fprintf(stderr, " -size integer : target size in kilobytes\n"); fprintf(stderr, " -single : single pass mode (default)\n"); fprintf(stderr, " -cq float : single pass constant quantizer\n"); fprintf(stderr, " -pass1 [filename] : twopass mode (first pass)\n"); @@ -1898,6 +1903,7 @@ fprintf(stderr, " -drop integer : Frame Drop Ratio (0..100) (0)\n"); fprintf(stderr, " -start integer : Starting frame number\n"); fprintf(stderr, " -threads integer : Number of threads\n"); + fprintf(stderr, " -slices integer : Number of slices\n"); fprintf(stderr, " -progress [integer] : Show progress updates every n frames (10)\n"); fprintf(stderr, " -par integer[:integer] : Set Pixel Aspect Ratio.\n"); fprintf(stderr, " 1 = 1:1\n"); @@ -1926,12 +1932,13 @@ int bytes, xsize, ysize, depth; char dummy[2]; - bytes = fread(dummy, 1, 2, handle); + bytes = (int) fread(dummy, 1, 2, handle); if ((bytes < 2) || (dummy[0] != 'P') || (dummy[1] != '5')) return (1); fscanf(handle, "%d %d %d", &xsize, &ysize, &depth); + fread(&dummy, 1, 1, handle); if ((xsize > 4096) || (ysize > 4096*3/2) || (depth != 255)) { fprintf(stderr, "%d %d %d\n", xsize, ysize, depth); return (2); @@ -1949,7 +1956,6 @@ unsigned char *image) { int i; - char dummy; unsigned char *y = image; unsigned char *u = image + XDIM * YDIM; @@ -1970,9 +1976,6 @@ v += XDIM / 2; } - /* I don't know why, but this seems needed */ - fread(&dummy, 1, 1, handle); - return (0); } #else @@ -2265,6 +2268,7 @@ #endif xvid_enc_create.num_threads = ARG_THREADS; + xvid_enc_create.num_slices = ARG_SLICES; /* Frame rate */ xvid_enc_create.fincr = ARG_DWSCALE; @@ -2585,7 +2589,7 @@ ZONES[NUM_ZONES].frame = 0; ZONES[NUM_ZONES].mode = XVID_ZONE_QUANT; - ZONES[NUM_ZONES].modifier = ARG_CQ; + ZONES[NUM_ZONES].modifier = (int)ARG_CQ; ZONES[NUM_ZONES].type = XVID_TYPE_AUTO; ZONES[NUM_ZONES].greyscale = 0; ZONES[NUM_ZONES].chroma_opt = 0; @@ -2601,7 +2605,7 @@ for(i = 0; i < NUM_ZONES; i++) if (ZONES[i].mode == XVID_ZONE_WEIGHT) { ZONES[i].mode = XVID_ZONE_QUANT; - ZONES[i].modifier = (100*ARG_CQ) / ZONES[i].modifier; + ZONES[i].modifier = (int) ((100*ARG_CQ) / ZONES[i].modifier); } } @@ -2670,7 +2674,7 @@ int i; char* userdata; - for (i=0; i <= (bufsize-sizeof(userdata_start_code)); i++) { + for (i=0; i <= (int)(bufsize-sizeof(userdata_start_code)); i++) { if (memcmp((void*)userdata_start_code, (void*)(buf+i), strlen(userdata_start_code))==0) { if ((userdata = strstr(buf+i+4, "DivX"))!=NULL) { userdata[strlen(userdata)-1] = '\0';