--- xvid_decraw.c 2006/02/15 19:16:39 1.24 +++ xvid_decraw.c 2010/03/09 09:20:05 1.27 @@ -20,7 +20,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_decraw.c,v 1.24 2006/02/15 19:16:39 Isibaar Exp $ + * $Id: xvid_decraw.c,v 1.27 2010/03/09 09:20:05 Isibaar Exp $ * ****************************************************************************/ @@ -56,6 +56,7 @@ #define USE_PNM 0 #define USE_TGA 1 +#define USE_YUV 2 static int XDIM = 0; static int YDIM = 0; @@ -65,6 +66,7 @@ static int CSP = XVID_CSP_I420; static int BPP = 1; static int FORMAT = USE_PNM; +static int POSTPROC = 0; static char filepath[256] = "./"; static void *dec_handle = NULL; @@ -87,9 +89,10 @@ xvid_dec_stats_t *xvid_dec_stats); static int dec_stop(); static void usage(); -static int write_image(char *prefix, unsigned char *image); +static int write_image(char *prefix, unsigned char *image, int filenr); static int write_pnm(char *filename, unsigned char *image); static int write_tga(char *filename, unsigned char *image); +static int write_yuv(char *filename, unsigned char *image); const char * type2str(int type) { @@ -120,7 +123,7 @@ long totalsize; int status; - int use_assembler = 0; + int use_assembler = 1; int debug_level = 0; char filename[256]; @@ -130,7 +133,7 @@ int i; printf("xvid_decraw - raw mpeg4 bitstream decoder "); - printf("written by Christoph Lampert 2002-2003\n\n"); + printf("written by Christoph Lampert\n\n"); /***************************************************************************** * Command line parsing @@ -138,8 +141,8 @@ for (i=1; i< argc; i++) { - if (strcmp("-asm", argv[i]) == 0 ) { - use_assembler = 1; + if (strcmp("-noasm", argv[i]) == 0 ) { + use_assembler = 0; } else if (strcmp("-debug", argv[i]) == 0 && i < argc - 1 ) { i++; if (sscanf(argv[i], "0x%x", &debug_level) != 1) { @@ -170,10 +173,17 @@ CSP = XVID_CSP_I420; BPP = 1; } + } else if (strcmp("-postproc", argv[i]) == 0 && i < argc - 1 ) { + i++; + POSTPROC = atoi(argv[i]); + if (POSTPROC < 0) POSTPROC = 0; + if (POSTPROC > 2) POSTPROC = 2; } else if (strcmp("-f", argv[i]) == 0 && i < argc -1) { i++; if (strcmp(argv[i], "tga") == 0) { FORMAT = USE_TGA; + } else if (strcmp(argv[i], "yuv") == 0) { + FORMAT = USE_YUV; } else { FORMAT = USE_PNM; } @@ -212,6 +222,9 @@ if (BPP != 1 && BPP != 3 && FORMAT == USE_PNM) { FORMAT = USE_TGA; } + if (BPP != 1 && FORMAT == USE_YUV) { + FORMAT = USE_TGA; + } /***************************************************************************** * Memory allocation @@ -224,7 +237,7 @@ goto free_all_memory; /***************************************************************************** - * XviD PART Start + * Xvid PART Start ****************************************************************************/ status = dec_init(use_assembler, debug_level); @@ -368,8 +381,9 @@ /* Save output frame if required */ if (ARG_SAVEDECOUTPUT) { - sprintf(filename, "%sdec%05d", filepath, filenr); - if(write_image(filename, out_buffer)) { + sprintf(filename, "%sdec", filepath); + + if(write_image(filename, out_buffer, filenr)) { fprintf(stderr, "Error writing decoded frame %s\n", filename); @@ -416,8 +430,9 @@ /* Save output frame if required */ if (ARG_SAVEDECOUTPUT) { - sprintf(filename, "%sdec%05d", filepath, filenr); - if(write_image(filename, out_buffer)) { + sprintf(filename, "%sdec", filepath); + + if(write_image(filename, out_buffer, filenr)) { fprintf(stderr, "Error writing decoded frame %s\n", filename); @@ -442,7 +457,7 @@ } /***************************************************************************** - * XviD PART Stop + * Xvid PART Stop ****************************************************************************/ release_all: @@ -468,12 +483,13 @@ fprintf(stderr, "Usage : xvid_decraw [OPTIONS]\n"); fprintf(stderr, "Options :\n"); - fprintf(stderr, " -asm : use assembly optimizations (default=disabled)\n"); + fprintf(stderr, " -noasm : don't use assembly optimizations (default=enabled)\n"); fprintf(stderr, " -debug : debug level (debug=0)\n"); fprintf(stderr, " -i string : input filename (default=stdin)\n"); fprintf(stderr, " -d : save decoder output\n"); fprintf(stderr, " -c csp : choose colorspace output (rgb16, rgb24, rgb32, yv12, i420)\n"); - fprintf(stderr, " -f format : choose output file format (tga, pnm, pgm)\n"); + fprintf(stderr, " -f format : choose output file format (tga, pnm, pgm, yuv)\n"); + fprintf(stderr, " -postproc : postprocessing level (0=off, 1=deblock, 2=deblock+dering)\n"); fprintf(stderr, " -m : save mpeg4 raw stream to individual files\n"); fprintf(stderr, " -help : This help message\n"); fprintf(stderr, " (* means default)\n"); @@ -503,7 +519,7 @@ * output functions ****************************************************************************/ -static int write_image(char *prefix, unsigned char *image) +static int write_image(char *prefix, unsigned char *image, int filenr) { char filename[1024]; char *ext; @@ -513,6 +529,8 @@ ext = "pgm"; } else if (FORMAT == USE_PNM && BPP == 3) { ext = "pnm"; + } else if (FORMAT == USE_YUV) { + ext = "yuv"; } else if (FORMAT == USE_TGA) { ext = "tga"; } else { @@ -520,10 +538,20 @@ exit(-1); } - sprintf(filename, "%s.%s", prefix, ext); + if (FORMAT == USE_YUV) { + sprintf(filename, "%s.%s", prefix, ext); + + if (!filenr) { + FILE *fp = fopen(filename, "wb"); + fclose(fp); + } + } else + sprintf(filename, "%s%05d.%s", prefix, filenr, ext); if (FORMAT == USE_PNM) { ret = write_pnm(filename, image); + } else if (FORMAT == USE_YUV) { + ret = write_yuv(filename, image); } else { ret = write_tga(filename, image); } @@ -652,6 +680,22 @@ return 0; } +static int write_yuv(char *filename, unsigned char *image) +{ + FILE * f; + + f = fopen(filename, "ab+"); + if ( f == NULL) { + return -1; + } + + fwrite(image, 1, 3*XDIM*YDIM/2, f); + + fclose(f); + + return 0; +} + /***************************************************************************** * Routines for decoding: init decoder, use, and stop decoder ****************************************************************************/ @@ -670,7 +714,7 @@ memset(&xvid_dec_create, 0, sizeof(xvid_dec_create_t)); /*------------------------------------------------------------------------ - * XviD core initialization + * Xvid core initialization *----------------------------------------------------------------------*/ /* Version */ @@ -691,7 +735,7 @@ xvid_global(NULL, 0, &xvid_gbl_init, NULL); /*------------------------------------------------------------------------ - * XviD encoder initialization + * Xvid decoder initialization *----------------------------------------------------------------------*/ /* Version */ @@ -732,7 +776,12 @@ xvid_dec_stats->version = XVID_VERSION; /* No general flags to set */ - xvid_dec_frame.general = 0; + if (POSTPROC == 1) + xvid_dec_frame.general = XVID_DEBLOCKY | XVID_DEBLOCKUV; + else if (POSTPROC==2) + xvid_dec_frame.general = XVID_DEBLOCKY | XVID_DEBLOCKUV | XVID_DERINGY | XVID_DERINGUV; + else + xvid_dec_frame.general = 0; /* Input stream */ xvid_dec_frame.bitstream = istream;