--- trunk/xvidcore/examples/xvid_decraw.c	2004/07/17 11:42:46	1501
+++ trunk/xvidcore/examples/xvid_decraw.c	2006/02/15 19:16:39	1678
@@ -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.16 2004-07-17 11:42:46 edgomez Exp $
+ * $Id: xvid_decraw.c,v 1.24 2006-02-15 19:16:39 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -54,9 +54,6 @@
  *               Global vars in module and constants
  ****************************************************************************/
 
-/* max number of frames */
-#define ABS_MAXFRAMENR 9999
-
 #define USE_PNM 0
 #define USE_TGA 1
 
@@ -74,6 +71,10 @@
 
 #define BUFFER_SIZE (2*1024*1024)
 
+static const int display_buffer_bytes = 0;
+
+#define MIN_USEFUL_BYTES 1
+
 /*****************************************************************************
  *               Local prototypes
  ****************************************************************************/
@@ -111,6 +112,7 @@
 	unsigned char *mp4_ptr    = NULL;
 	unsigned char *out_buffer = NULL;
 	int useful_bytes;
+	int chunk;
 	xvid_dec_stats_t xvid_dec_stats;
 	
 	double totaldectime;
@@ -244,7 +246,8 @@
 	totalsize = 0;
 	filenr = 0;
 	mp4_ptr = mp4_buffer;
-
+	chunk = 0;
+	
 	do {
 		int used_bytes = 0;
 		double dectime;
@@ -264,13 +267,11 @@
 			mp4_ptr = mp4_buffer; 
 
 			/* read new data */
-            if(feof(in_file))
-				break;
-
-			useful_bytes += fread(mp4_buffer + already_in_buffer,
-								  1, BUFFER_SIZE - already_in_buffer,
-								  in_file);
-
+            if(!feof(in_file)) {
+				useful_bytes += fread(mp4_buffer + already_in_buffer,
+									  1, BUFFER_SIZE - already_in_buffer,
+									  in_file);
+			}
 		}
 
 
@@ -302,6 +303,22 @@
 
 					fprintf(stderr, "Resized frame buffer to %dx%d\n", XDIM, YDIM);
 				}
+
+				/* Save individual mpeg4 stream if required */
+				if(ARG_SAVEMPEGSTREAM) {
+					FILE *filehandle = NULL;
+
+					sprintf(filename, "%svolhdr.m4v", filepath);
+					filehandle = fopen(filename, "wb");
+					if(!filehandle) {
+						fprintf(stderr,
+								"Error writing vol header mpeg4 stream to file %s\n",
+								filename);
+					} else {
+						fwrite(mp4_ptr, 1, used_bytes, filehandle);
+						fclose(filehandle);
+					}
+				}
 			}
 
 			/* Update buffer pointers */
@@ -313,7 +330,10 @@
 				totalsize += used_bytes;
 			}
 
-		}while(xvid_dec_stats.type <= 0 && useful_bytes > 0);
+			if (display_buffer_bytes) {
+				printf("Data chunk %d: %d bytes consumed, %d bytes in buffer\n", chunk++, used_bytes, useful_bytes);
+			}
+		} while (xvid_dec_stats.type <= 0 && useful_bytes > MIN_USEFUL_BYTES);
 
 		/* Check if there is a negative number of useful bytes left in buffer
 		 * This means we went too far */
@@ -324,9 +344,11 @@
 		totaldectime += dectime;
 
 			
-        printf("Frame %5d: type = %s, dectime(ms) =%6.1f, length(bytes) =%7d\n",
-			   filenr, type2str(xvid_dec_stats.type), dectime, used_bytes);
-			
+		if (!display_buffer_bytes) {
+			printf("Frame %5d: type = %s, dectime(ms) =%6.1f, length(bytes) =%7d\n",
+					filenr, type2str(xvid_dec_stats.type), dectime, used_bytes);
+		}
+
 		/* Save individual mpeg4 stream if required */
 		if(ARG_SAVEMPEGSTREAM) {
 			FILE *filehandle = NULL;
@@ -356,7 +378,9 @@
 
 		filenr++;
 
-	} while ( (status>=0) && (filenr<ABS_MAXFRAMENR));
+	} while (useful_bytes>MIN_USEFUL_BYTES || !feof(in_file));
+
+	useful_bytes = 0; /* Empty buffer */
 
 /*****************************************************************************
  *     Flush decoder buffers
@@ -372,7 +396,10 @@
 		    dectime = msecond();
 		    used_bytes = dec_main(NULL, out_buffer, -1, &xvid_dec_stats);
 		    dectime = msecond() - dectime;
-        }while(used_bytes>=0 && xvid_dec_stats.type <= 0);
+			if (display_buffer_bytes) {
+				printf("Data chunk %d: %d bytes consumed, %d bytes in buffer\n", chunk++, used_bytes, useful_bytes);
+			}
+        } while(used_bytes>=0 && xvid_dec_stats.type <= 0);
 
         if (used_bytes < 0) {   /* XVID_ERR_END */
             break;
@@ -382,9 +409,11 @@
 		totaldectime += dectime;
 
 		/* Prints some decoding stats */
-        printf("Frame %5d: type = %s, dectime(ms) =%6.1f, length(bytes) =%7d\n",
-			   filenr, type2str(xvid_dec_stats.type), dectime, used_bytes);
-			
+		if (!display_buffer_bytes) {
+			printf("Frame %5d: type = %s, dectime(ms) =%6.1f, length(bytes) =%7d\n",
+					filenr, type2str(xvid_dec_stats.type), dectime, used_bytes);
+		}
+
 		/* Save output frame if required */
 		if (ARG_SAVEDECOUTPUT) {
 			sprintf(filename, "%sdec%05d", filepath, filenr);
@@ -466,7 +495,7 @@
 #else
 	clock_t clk;
 	clk = clock();
-	return(clk * 1000 / CLOCKS_PER_SEC);
+	return(clk * 1000.0 / CLOCKS_PER_SEC);
 #endif
 }
 
@@ -545,21 +574,21 @@
 #else
 	{
 		int i;
-		for (i=0; i<width*height*BPP;i+=BPP) {
+		for (i=0; i<XDIM*YDIM*BPP;i+=BPP) {
 			if (BPP == 1) {
-				fputc(image+i, f);
+				fputc(*(image+i), f);
 			} else if (BPP == 2) {
-				fputc(image+i+1, f);
-				fputc(image+i+0, f);
+				fputc(*(image+i+1), f);
+				fputc(*(image+i+0), f);
 			} else if (BPP == 3) {
-				fputc(image+i+2, f);
-				fputc(image+i+1, f);
-				fputc(image+i+0, f);
+				fputc(*(image+i+2), f);
+				fputc(*(image+i+1), f);
+				fputc(*(image+i+0), f);
 			} else if (BPP == 4) {
-				fputc(image+i+3, f);
-				fputc(image+i+2, f);
-				fputc(image+i+1, f);
-				fputc(image+i+0, f);
+				fputc(*(image+i+3), f);
+				fputc(*(image+i+2), f);
+				fputc(*(image+i+1), f);
+				fputc(*(image+i+0), f);
 			}
 		}
 	}
@@ -594,7 +623,7 @@
 
 	if (BPP == 1) {
 		int i;
-		fprintf(f, "P5\n#xvid\n%i %i\n255\n", XDIM, YDIM*3/2);
+		fprintf(f, "P5\n%i %i\n255\n", XDIM, YDIM*3/2);
 
 		fwrite(image, 1, XDIM*YDIM, f);
 
@@ -694,6 +723,10 @@
 
 	xvid_dec_frame_t xvid_dec_frame;
 
+	/* Reset all structures */
+	memset(&xvid_dec_frame, 0, sizeof(xvid_dec_frame_t));
+	memset(xvid_dec_stats, 0, sizeof(xvid_dec_stats_t));
+
 	/* Set version */
 	xvid_dec_frame.version = XVID_VERSION;
 	xvid_dec_stats->version = XVID_VERSION;