git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed rate to samplerate.
[swftools.git]
/
avi2swf
/
videoreader_avifile.cc
diff --git
a/avi2swf/videoreader_avifile.cc
b/avi2swf/videoreader_avifile.cc
index
781beee
..
0cd2599
100644
(file)
--- a/
avi2swf/videoreader_avifile.cc
+++ b/
avi2swf/videoreader_avifile.cc
@@
-63,7
+63,6
@@
static int shutdown_avi2swf = 0;
static int verbose = 0;
static int shutdown_avi2swf = 0;
static int verbose = 0;
-static int flip = 0;
typedef struct _videoreader_avifile_internal
{
typedef struct _videoreader_avifile_internal
{
@@
-73,6
+72,7
@@
typedef struct _videoreader_avifile_internal
int do_audio;
int do_video;
int eof;
int do_audio;
int do_video;
int eof;
+ int flip;
int frame;
int soundbits;
ringbuffer_t audio_buffer;
int frame;
int soundbits;
ringbuffer_t audio_buffer;
@@
-157,7
+157,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];
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);
from = img->At(v->height-y-1);
else
from = img->At(y);
@@
-196,6
+196,13
@@
static void videoreader_avifile_close(videoreader_t* v)
}
static void videoreader_avifile_setparameter(videoreader_t*v, char*name, char*value)
{
}
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);
}
if(verbose) {
printf("videoreader_setparameter(%s, %s)\n", name, value);fflush(stdout);
}
@@
-262,7
+269,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->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
v->fps = 1000000.0/dwMicroSecPerFrame;
i->soundbits = 16;
#else
@@
-283,11
+290,11
@@
int videoreader_avifile_open(videoreader_t* v, char* filename)
audioinfo = i->astream->GetStreamInfo();
v->channels = wave.nChannels;
audioinfo = i->astream->GetStreamInfo();
v->channels = wave.nChannels;
- v->rate = wave.nSamplesPerSec;
+ v->samplerate = wave.nSamplesPerSec;
i->soundbits = wave.wBitsPerSample;
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();
}
v->channels = audioinfo->GetAudioChannels();
i->soundbits = audioinfo->GetAudioBitsPerSample();
}
@@
-301,7
+308,7
@@
int videoreader_avifile_open(videoreader_t* v, char* filename)
i->do_audio = 0;
i->soundbits = 0;
v->channels = 0;
i->do_audio = 0;
i->soundbits = 0;
v->channels = 0;
- v->rate = 0;
+ v->samplerate = 0;
}
}
#endif
}
}
#endif