X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=avi2swf%2Fvideoreader_avifile.cc;h=afe4f542aa5cb741376fa25ed974ae1854e063bb;hb=aa34df2f7434eb76f98ab1438c7d44d66ef418a4;hp=0cd2599beafaa788f4dc8933a3847633b50ef4d2;hpb=d6b5ebb01904d445f6ed9e00a54ca5e1e6c800cd;p=swftools.git

diff --git a/avi2swf/videoreader_avifile.cc b/avi2swf/videoreader_avifile.cc
index 0cd2599..afe4f54 100644
--- a/avi2swf/videoreader_avifile.cc
+++ b/avi2swf/videoreader_avifile.cc
@@ -23,6 +23,9 @@
 #include <stdio.h>
 #include <memory.h>
 #include "../config.h"
+#include "videoreader.h"
+
+#ifdef HAVE_AVIFILE
 
 #undef HAVE_CONFIG_H
 
@@ -59,9 +62,7 @@
 #endif
 
 #include "../lib/q.h"
-#include "videoreader.h"
 
-static int shutdown_avi2swf = 0;
 static int verbose = 0;
 
 typedef struct _videoreader_avifile_internal
@@ -71,45 +72,54 @@ typedef struct _videoreader_avifile_internal
     IAviReadStream* vstream;
     int do_audio;
     int do_video;
-    int eof;
+    int video_eof;
+    int audio_eof;
     int flip;
     int frame;
     int soundbits;
     ringbuffer_t audio_buffer;
 } videoreader_avifile_internal;
 
-static void readSamples(videoreader_avifile_internal*i, void*buffer, int buffer_size, int numsamples)
+static int readSamples(videoreader_avifile_internal*i, void*buffer, int buffer_size, int numsamples)
 {
     int ret;
     while(i->audio_buffer.available < buffer_size) {
 	unsigned int samples_read = 0, bytes_read = 0;
 	ret = i->astream->ReadFrames(buffer, buffer_size, numsamples, samples_read, bytes_read);
-	if(samples_read<=0)
-	    return;
+	if(samples_read<=0) {
+	    int l = i->audio_buffer.available; 
+	    ringbuffer_read(&i->audio_buffer, buffer, l);
+	    return l;
+	}
 	ringbuffer_put(&i->audio_buffer, buffer, bytes_read);
     }
     ringbuffer_read(&i->audio_buffer, buffer, buffer_size);
+    return buffer_size;
 }
 static int videoreader_avifile_getsamples(videoreader_t* v, void*buffer, int num)
 {
+    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
     if(verbose) {
 	printf("videoreader_getsamples(%d)\n", num);fflush(stdout);
     }
-    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
+    if(i->audio_eof)
+	return 0;
     if(i->soundbits == 8) {
-	readSamples(i, buffer, num/2, num/(v->channels*2));
+	int num_read = readSamples(i, buffer, num/2, num/(v->channels*2))*2;
 	unsigned char*b = (unsigned char*)buffer;
 	int t;
-	for(t=num-2;t>=0;t-=2) {
+	for(t=num_read-2;t>=0;t-=2) {
 	    unsigned char x = b[t/2];
 	    b[t] = 0;
 	    b[t+1] = x-128;
 	}
-	return num;
+	if(!num_read) i->audio_eof=1;
+	return num_read;
     }
     if(i->soundbits == 16) {
-	readSamples(i, buffer, num, num/(v->channels*2));
-	return num;
+	int num_read = readSamples(i, buffer, num, num/(v->channels*2));
+	if(!num_read) i->audio_eof=1;
+	return num_read;
     }
     return 0;
 }
@@ -120,22 +130,19 @@ static int videoreader_avifile_getimage(videoreader_t* v, void*buffer)
 	printf("videoreader_getimage()\n");fflush(stdout);
     }
 
-    if(shutdown_avi2swf)
-	i->eof = 1;
-    
-    if(i->eof)
+    if(i->video_eof)
 	return 0;
 
     if(i->vstream->ReadFrame() < 0) {
 	if(verbose) printf("vstream->ReadFrame() returned value < 0, shutting down...\n");
-	i->eof = 1;
+	i->video_eof = 1;
 	return 0;
     }
     CImage*img2 = 0;
     CImage*img = i->vstream->GetFrame();
     if(!img) {
 	if(verbose) printf("vstream->GetFrame() returned NULL, shutting down...\n");
-	i->eof = 1;
+	i->video_eof = 1;
 	return 0;
     }
     /* we convert the image to YUV first, because we can convert to RGB from YUV only */
@@ -173,17 +180,10 @@ static int videoreader_avifile_getimage(videoreader_t* v, void*buffer)
     } else {
 	if(img2) delete img2;
 	if(verbose) printf("Can't handle bpp %d, shutting down...\n", bpp);
+	i->video_eof = 1;
 	return 0;
     }
 }
-static bool videoreader_avifile_eof(videoreader_t* v)
-{
-    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
-    if(verbose) {
-	printf("videoreader_eof()\n");fflush(stdout);
-    }
-    return i->eof;
-}
 static void videoreader_avifile_close(videoreader_t* v)
 {
     videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
@@ -210,13 +210,16 @@ static void videoreader_avifile_setparameter(videoreader_t*v, char*name, char*va
 
 int videoreader_avifile_open(videoreader_t* v, char* filename)
 {
+    if(!filename) {
+	/* codec query */
+	return 0;
+    }
     videoreader_avifile_internal* i;
     i = (videoreader_avifile_internal*)malloc(sizeof(videoreader_avifile_internal));
     memset(i, 0, sizeof(videoreader_avifile_internal));
     memset(v, 0, sizeof(videoreader_t));
     v->getsamples = videoreader_avifile_getsamples;
     v->close = videoreader_avifile_close;
-    v->eof = videoreader_avifile_eof;
     v->getimage = videoreader_avifile_getimage;
     v->getsamples = videoreader_avifile_getsamples;
     v->setparameter = videoreader_avifile_setparameter;
@@ -252,7 +255,7 @@ int videoreader_avifile_open(videoreader_t* v, char* filename)
 
     if(!i->do_video && !i->do_audio) {
 	printf("File has neither audio nor video streams.(?)\n");
-	return 0;
+	return -1;
     }
 
 #ifndef VERSION6
@@ -323,6 +326,14 @@ int videoreader_avifile_open(videoreader_t* v, char* filename)
 #endif
     }
 
-    return 1;
+    return 0;
+}
+
+#else  //HAVE_AVIFILE
+
+int videoreader_avifile_open(videoreader_t* v, char* filename)
+{
+    return -1;
 }
 
+#endif //HAVE_AVIFILE