X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=avi2swf%2Fvideoreader_avifile.cc;h=42e6b7222a528e65b6cc5230beed24486aff5f8a;hb=91848889de64a4efacc5930c2109f96fb6ed1146;hp=825d12a4ec7562144165053459ccb76f46f07f9c;hpb=d40beabc5e8751ea4d43b12e1f1b338e719de2b4;p=swftools.git

diff --git a/avi2swf/videoreader_avifile.cc b/avi2swf/videoreader_avifile.cc
index 825d12a..42e6b72 100644
--- a/avi2swf/videoreader_avifile.cc
+++ b/avi2swf/videoreader_avifile.cc
@@ -19,13 +19,12 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <memory.h>
 #include "../config.h"
 
-extern "C" {
-#include "../lib/args.h"
-}
-#include "v2swf.h"
-#include "../lib/q.h"
+#ifdef HAVE_AVIFILE
 
 #undef HAVE_CONFIG_H
 
@@ -53,8 +52,20 @@ extern "C" {
    #define Bpp bpp
 #endif
 
+#ifdef HAVE_SIGNAL_H
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#include <signal.h>
+#define DO_SIGNALS
+#endif
+#endif
+
+#include "../lib/q.h"
 #include "videoreader.h"
 
+static int shutdown_avi2swf = 0;
+static int verbose = 0;
+
 typedef struct _videoreader_avifile_internal
 {
     IAviReadFile* player;
@@ -63,6 +74,7 @@ typedef struct _videoreader_avifile_internal
     int do_audio;
     int do_video;
     int eof;
+    int flip;
     int frame;
     int soundbits;
     ringbuffer_t audio_buffer;
@@ -138,8 +150,7 @@ static int videoreader_avifile_getimage(videoreader_t* v, void*buffer)
 	img = img2;
     }
 
-
-    frameno++;
+    v->frame++;
     i->frame++;
     unsigned char*data = img->Data();
     int bpp = img->Bpp();
@@ -148,7 +159,7 @@ static int videoreader_avifile_getimage(videoreader_t* v, void*buffer)
 	for(y=0;y<v->height;y++) {
 	    unsigned char*from,*to;
 	    to = &((unsigned char*)buffer)[y*v->width*4];
-	    if(flip)
+	    if(i->flip)
 		from = img->At(v->height-y-1);
 	    else
 		from = img->At(y);
@@ -187,6 +198,13 @@ static void videoreader_avifile_close(videoreader_t* v)
 }
 static void videoreader_avifile_setparameter(videoreader_t*v, char*name, char*value)
 {
+    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
+    if(!strcmp(name, "verbose")) {
+	verbose = atoi(value);
+    }
+    if(!strcmp(name, "flip")) {
+	i->flip = atoi(value);
+    }
     if(verbose) {
 	printf("videoreader_setparameter(%s, %s)\n", name, value);fflush(stdout);
     }
@@ -194,18 +212,22 @@ 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->getinfo = videoreader_avifile_getinfo;
     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;
     v->internal = i;
+    v->frame = 0;
     
     i->do_video = 1;
     i->do_audio = 1;
@@ -236,7 +258,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
@@ -253,7 +275,7 @@ int videoreader_avifile_open(videoreader_t* v, char* filename)
     v->height = head.dwHeight;
     dwMicroSecPerFrame = head.dwMicroSecPerFrame;
     samplesperframe = astream->GetEndPos()/astream->GetEndTime()*head.dwMicroSecPerFrame/1000000;
-    v->rate = (int)(astream->GetEndPos()/astream->GetEndTime());
+    v->samplerate = (int)(astream->GetEndPos()/astream->GetEndTime());
     v->fps = 1000000.0/dwMicroSecPerFrame;
     i->soundbits = 16;
 #else
@@ -274,11 +296,11 @@ int videoreader_avifile_open(videoreader_t* v, char* filename)
 	audioinfo = i->astream->GetStreamInfo();
 
 	v->channels = wave.nChannels;
-	v->rate = wave.nSamplesPerSec;
+	v->samplerate = wave.nSamplesPerSec;
 	i->soundbits = wave.wBitsPerSample;
 
-	if(v->channels==0 || v->rate==0 || i->soundbits==0 || wave.wFormatTag!=1) {
-	    v->rate = audioinfo->GetAudioSamplesPerSec();
+	if(v->channels==0 || v->samplerate==0 || i->soundbits==0 || wave.wFormatTag!=1) {
+	    v->samplerate = audioinfo->GetAudioSamplesPerSec();
 	    v->channels = audioinfo->GetAudioChannels();
 	    i->soundbits = audioinfo->GetAudioBitsPerSample();
 	}
@@ -292,7 +314,7 @@ int videoreader_avifile_open(videoreader_t* v, char* filename)
 	    i->do_audio = 0;
 	    i->soundbits = 0;
 	    v->channels = 0;
-	    v->rate = 0;
+	    v->samplerate = 0;
 	}
     }
 #endif
@@ -307,6 +329,15 @@ 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