moved avifile stuff into videoreader_avifile.cc

diff --git a/avi2swf/avi2swf.cc b/avi2swf/avi2swf.cc
index d231762..c530cbb 100644 (file)
--- a/avi2swf/avi2swf.cc
+++ b/avi2swf/avi2swf.cc
@@ -38,33 +38,7 @@ extern "C" {
 #include "../lib/args.h"
 }
 #include "v2swf.h"
-#include "../lib/q.h"
-
-#undef HAVE_CONFIG_H
-
-#ifdef HAVE_VERSION_H
-  #include <version.h>
-#endif
-#ifdef HAVE_AVIFILE_VERSION_H
-  #include <avifile/version.h>
-#endif
-
-#if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6) 
-   #include <avifile.h>
-   #include <aviplay.h>
-   #include <fourcc.h>
-   #include <creators.h>
-   #include <StreamInfo.h>
-   #define VERSION6
-#else
-   #include <avifile.h>
-   #include <aviplay.h>
-   #include <aviutil.h>
-   #define Width width
-   #define Height height
-   #define Data data
-   #define Bpp bpp
-#endif
+#include "videoreader_avifile.hh"
 
 static char * filename = 0;
 static char * outputfilename = "output.swf";
@@ -214,19 +188,6 @@ static char*itoa(int a)
     return toabuf;
 }
 
-typedef struct _videoreader_avifile_internal
-{
-    IAviReadFile* player;
-    IAviReadStream* astream;
-    IAviReadStream* vstream;
-    int do_audio;
-    int do_video;
-    int eof;
-    int frame;
-    int soundbits;
-    ringbuffer_t audio_buffer;
-} videoreader_avifile_internal;
-
 static int shutdown_avi2swf = 0;
 static int frameno = 0;
 
@@ -247,252 +208,6 @@ static void sigterm(int sig)
 }
 #endif
 
-static void 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;
-       ringbuffer_put(&i->audio_buffer, buffer, bytes_read);
-    }
-    ringbuffer_read(&i->audio_buffer, buffer, buffer_size);
-}
-int videoreader_avifile_getsamples(videoreader_t* v, void*buffer, int num)
-{
-    if(verbose) {
-       printf("videoreader_getsamples(%d)\n", num);fflush(stdout);
-    }
-    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
-    if(i->soundbits == 8) {
-       readSamples(i, buffer, num/2, num/(v->channels*2));
-       unsigned char*b = (unsigned char*)buffer;
-       int t;
-       for(t=num-2;t>=0;t-=2) {
-           unsigned char x = b[t/2];
-           b[t] = 0;
-           b[t+1] = x-128;
-       }
-       return num;
-    }
-    if(i->soundbits == 16) {
-       readSamples(i, buffer, num, num/(v->channels*2));
-       return num;
-    }
-    return 0;
-}
-int videoreader_avifile_getimage(videoreader_t* v, void*buffer)
-{
-    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
-    if(verbose) {
-       printf("videoreader_getimage()\n");fflush(stdout);
-    }
-
-    if(shutdown_avi2swf)
-       i->eof = 1;
-    
-    if(i->eof)
-       return 0;
-
-    if(i->vstream->ReadFrame() < 0) {
-       if(verbose) printf("vstream->ReadFrame() returned value < 0, shutting down...\n");
-       i->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;
-       return 0;
-    }
-    /* we convert the image to YUV first, because we can convert to RGB from YUV only */
-    img->ToYUV();
-    img->ToRGB();
-    if(img->Bpp() != 3) {
-       if(verbose) printf("Warning: converthing from bpp %d to bpp 3, this fails on older avifile versions...\n", img->Bpp());
-       BitmapInfo tmp(v->width, v->height, 24);
-       img2 = new CImage(img, &tmp);
-       img = img2;
-    }
-
-
-    frameno++;
-    i->frame++;
-    unsigned char*data = img->Data();
-    int bpp = img->Bpp();
-    if(bpp == 3) {
-       int x,y;
-       for(y=0;y<v->height;y++) {
-           unsigned char*from,*to;
-           to = &((unsigned char*)buffer)[y*v->width*4];
-           if(flip)
-               from = img->At(v->height-y-1);
-           else
-               from = img->At(y);
-           for(x=0;x<v->width;x++) {
-               to[x*4+0] = 0;
-               to[x*4+1] = from[x*3+2];
-               to[x*4+2] = from[x*3+1];
-               to[x*4+3] = from[x*3+0];
-           }
-       }
-       if(img2) delete img2;
-       return v->width*v->height*4;
-    } else {
-       if(img2) delete img2;
-       if(verbose) printf("Can't handle bpp %d, shutting down...\n", bpp);
-       return 0;
-    }
-}
-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;
-}
-void videoreader_avifile_close(videoreader_t* v)
-{
-    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
-    if(verbose) {
-       printf("videoreader_close()\n");fflush(stdout);
-    }
-    if(i->do_audio) {
-       ringbuffer_clear(&i->audio_buffer);
-    }
-}
-void* videoreader_avifile_getinfo(videoreader_t* v, char* name)
-{
-    return 0;
-}
-void videoreader_avifile_setparameter(videoreader_t*v, char*name, char*value)
-{
-    if(verbose) {
-       printf("videoreader_setparameter(%s, %s)\n", name, value);fflush(stdout);
-    }
-}
-
-int videoreader_avifile_open(videoreader_t* v, char* filename)
-{
-    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;
-    
-    i->do_video = 1;
-    i->do_audio = 1;
-
-    i->player = CreateIAviReadFile(filename);    
-    if(verbose) {
-       printf("%d streams (%d video, %d audio)\n", 
-               i->player->StreamCount(),
-               i->player->VideoStreamCount(),
-               i->player->AudioStreamCount());
-    }
-    i->astream = i->player->GetStream(0, AviStream::Audio);
-    i->vstream = i->player->GetStream(0, AviStream::Video);
-    if(!i->vstream) {
-       printf("Couldn't open video stream\n");
-       i->do_video = 0;
-    }
-    if(!i->astream) {
-       printf("Couldn't open video stream\n");
-       i->do_audio = 0;
-    }
-#ifdef NO_MP3
-    if(i->do_audio) {
-       printf(stderr, "MP3 support has been disabled at compile time, not converting soundtrack");
-       i->do_audio = 0;
-    }
-#endif
-
-    if(!i->do_video && !i->do_audio) {
-       printf("File has neither audio nor video streams.(?)\n");
-       return 0;
-    }
-
-#ifndef VERSION6
-    MainAVIHeader head;
-    int dwMicroSecPerFrame = 0;
-    player->GetFileHeader(&head);
-    printf("fps: %d\n", 1000000/head.dwMicroSecPerFrame);
-    printf("frames: %d\n", head.dwTotalFrames);
-    printf("streams: %d\n", head.dwStreams);
-    printf("width: %d\n", head.dwWidth);
-    printf("height: %d\n", head.dwHeight);
-    printf("sound: %u samples (%f seconds)\n", i->astream->GetEndPos(), i->astream->GetEndTime());
-    v->width = head.dwWidth;
-    v->height = head.dwHeight;
-    dwMicroSecPerFrame = head.dwMicroSecPerFrame;
-    samplesperframe = astream->GetEndPos()/astream->GetEndTime()*head.dwMicroSecPerFrame/1000000;
-    v->rate = (int)(astream->GetEndPos()/astream->GetEndTime());
-    v->fps = 1000000.0/dwMicroSecPerFrame;
-    i->soundbits = 16;
-#else
-    if(i->do_video)
-    {
-       StreamInfo*videoinfo;
-       videoinfo = i->vstream->GetStreamInfo();
-       v->width = videoinfo->GetVideoWidth();
-       v->height = videoinfo->GetVideoHeight();
-       v->fps = (double)(videoinfo->GetFps());
-    }
-    if(i->do_audio)
-    {
-       WAVEFORMATEX wave;
-       StreamInfo*audioinfo;
-
-       i->astream->GetAudioFormatInfo(&wave,0);
-       audioinfo = i->astream->GetStreamInfo();
-
-       v->channels = wave.nChannels;
-       v->rate = wave.nSamplesPerSec;
-       i->soundbits = wave.wBitsPerSample;
-
-       if(v->channels==0 || v->rate==0 || i->soundbits==0 || wave.wFormatTag!=1) {
-           v->rate = audioinfo->GetAudioSamplesPerSec();
-           v->channels = audioinfo->GetAudioChannels();
-           i->soundbits = audioinfo->GetAudioBitsPerSample();
-       }
-
-       if(verbose) {
-           printf("formatinfo: format %d, %d channels, %d bits/sample, rate %d, blockalign %d\n", wave.wFormatTag, wave.nChannels, wave.wBitsPerSample, wave.nSamplesPerSec, wave.nBlockAlign);
-           printf("audioinfo: %d channels, %d bits/sample, rate %d\n", audioinfo->GetAudioChannels(), audioinfo->GetAudioBitsPerSample(), audioinfo->GetAudioSamplesPerSec());
-       }
-       if(i->soundbits != 8 && i->soundbits != 16) {
-           printf("Can't handle %d bit audio, disabling sound\n", wave.wBitsPerSample);
-           i->do_audio = 0;
-           i->soundbits = 0;
-           v->channels = 0;
-           v->rate = 0;
-       }
-    }
-#endif
-    i->vstream -> StartStreaming();
-    if(i->do_audio) {
-       i->astream -> StartStreaming();
-       ringbuffer_init(&i->audio_buffer);
-#ifdef VERSION6
-       WAVEFORMATEX wave;
-       i->astream -> GetOutputFormat(&wave, sizeof(wave));
-       printf("formatinfo: format %d, %d channels, %d bits/sample, rate %d, blockalign %d\n", wave.wFormatTag, wave.nChannels, wave.wBitsPerSample, wave.nSamplesPerSec, wave.nBlockAlign);
-#endif
-    }
-
-    return 1;
-}
-
 int main (int argc,char ** argv)
 { 
     videoreader_t video;