X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=avi2swf%2Fvideoreader_avifile.cc;h=371835d84c6506ea5f3b9cea0b5eb684a99abf8d;hp=42e6b7222a528e65b6cc5230beed24486aff5f8a;hb=2c719855eac434f01d47ba0717d76de65939d74e;hpb=91848889de64a4efacc5930c2109f96fb6ed1146 diff --git a/avi2swf/videoreader_avifile.cc b/avi2swf/videoreader_avifile.cc index 42e6b72..371835d 100644 --- a/avi2swf/videoreader_avifile.cc +++ b/avi2swf/videoreader_avifile.cc @@ -23,6 +23,7 @@ #include #include #include "../config.h" +#include "videoreader.h" #ifdef HAVE_AVIFILE @@ -38,8 +39,8 @@ #if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6) #include #include - #include - #include + #include + #include #include #define VERSION6 #else @@ -61,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 @@ -73,45 +72,69 @@ 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(ret!=0) { + if(verbose) { + printf("ReadFrames() returns %d\n", ret);fflush(stdout); + } + } + 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) { + if(verbose) { + printf("end of audio\n");fflush(stdout); + } + 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) { + if(verbose) { + printf("end of audio\n");fflush(stdout); + } + i->audio_eof=1; + } + return num_read; } return 0; } @@ -122,22 +145,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 */ @@ -175,17 +195,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; @@ -222,7 +235,6 @@ int videoreader_avifile_open(videoreader_t* v, char* filename) 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; @@ -268,11 +280,11 @@ int videoreader_avifile_open(videoreader_t* v, char* filename) 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("width: %d\n", abs(head.dwWidth)); + printf("height: %d\n", abs(head.dwHeight)); printf("sound: %u samples (%f seconds)\n", i->astream->GetEndPos(), i->astream->GetEndTime()); - v->width = head.dwWidth; - v->height = head.dwHeight; + v->width = abs(head.dwWidth); + v->height = abs(head.dwHeight); dwMicroSecPerFrame = head.dwMicroSecPerFrame; samplesperframe = astream->GetEndPos()/astream->GetEndTime()*head.dwMicroSecPerFrame/1000000; v->samplerate = (int)(astream->GetEndPos()/astream->GetEndTime()); @@ -283,8 +295,8 @@ int videoreader_avifile_open(videoreader_t* v, char* filename) { StreamInfo*videoinfo; videoinfo = i->vstream->GetStreamInfo(); - v->width = videoinfo->GetVideoWidth(); - v->height = videoinfo->GetVideoHeight(); + v->width = abs(videoinfo->GetVideoWidth()); + v->height = abs(videoinfo->GetVideoHeight()); v->fps = (double)(videoinfo->GetFps()); } if(i->do_audio) @@ -334,7 +346,6 @@ int videoreader_avifile_open(videoreader_t* v, char* filename) #else //HAVE_AVIFILE - int videoreader_avifile_open(videoreader_t* v, char* filename) { return -1;