--- trunk/xvidcore/examples/xvid_decraw.c 2004/04/15 12:05:19 1431 +++ trunk/xvidcore/examples/xvid_decraw.c 2004/04/15 19:44:06 1432 @@ -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.13 2004-04-13 21:20:45 suxen_drol Exp $ + * $Id: xvid_decraw.c,v 1.14 2004-04-15 19:44:05 edgomez Exp $ * ****************************************************************************/ @@ -79,6 +79,8 @@ ****************************************************************************/ static double msecond(); +static int write_pgm(char *filename, + unsigned char *image); static int dec_init(int use_assembler, int debug_level); static int dec_main(unsigned char *istream, unsigned char *ostream, @@ -86,10 +88,9 @@ 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_tga(char *filename, unsigned char *image); -static int write_pnm(char *filename, unsigned char *image); - +int write_image(char *prefix, unsigned char *image); +int write_pnm(char *filename, unsigned char *image); +int write_tga(char *filename, unsigned char *image); const char * type2str(int type) { @@ -184,13 +185,13 @@ exit(-1); } } - + #if defined(_MSC_VER) if (ARG_INPUTFILE==NULL) { - fprintf(stderr, "Warning: MSVC build does not read correctly from stdin. Use the -i switch.\n\n"); + fprintf(stderr, "Warning: MSVC build does not read EOF correctly from stdin. Use the -i switch.\n\n"); } #endif - + /***************************************************************************** * Values checking ****************************************************************************/ @@ -350,7 +351,7 @@ sprintf(filename, "%sdec%05d", filepath, filenr); if(write_image(filename, out_buffer)) { fprintf(stderr, - "Error writing decoded frame %s\n", + "Error writing decoded PGM frame %s\n", filename); } } @@ -405,14 +406,13 @@ ****************************************************************************/ if (filenr>0) { - totalsize /= filenr; + totalsize /= filenr; totaldectime /= filenr; printf("Avg: dectime(ms) =%7.2f, fps =%7.2f, length(bytes) =%7d\n", totaldectime, 1000/totaldectime, (int)totalsize); }else{ printf("Nothing was decoded!\n"); } - /***************************************************************************** * XviD PART Stop @@ -476,7 +476,7 @@ * output functions ****************************************************************************/ -static int write_image(char *prefix, unsigned char *image) +int write_image(char *prefix, unsigned char *image) { char filename[1024]; char *ext; @@ -504,7 +504,7 @@ return(ret); } -static int write_tga(char *filename, unsigned char *image) +int write_tga(char *filename, unsigned char *image) { FILE * f; char hdr[18];