git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2461474
)
fixed framerate/sound synchronization (account for 8.8 rounding error)
author
kramm
<kramm>
Thu, 7 Apr 2005 08:59:03 +0000
(08:59 +0000)
committer
kramm
<kramm>
Thu, 7 Apr 2005 08:59:03 +0000
(08:59 +0000)
avi2swf/v2swf.c
patch
|
blob
|
history
diff --git
a/avi2swf/v2swf.c
b/avi2swf/v2swf.c
index
616fa21
..
db32c0c
100644
(file)
--- a/
avi2swf/v2swf.c
+++ b/
avi2swf/v2swf.c
@@
-39,6
+39,7
@@
typedef struct _v2swf_internal_t
ringbuffer_t r;
videoreader_t* video;
ringbuffer_t r;
videoreader_t* video;
+ double video_fps;
int width;
int height;
int width;
int height;
@@
-829,6
+830,7
@@
int v2swf_init(v2swf_t*v2swf, videoreader_t * video)
msg("video: %dx%d, fps %f\n", video->width, video->height, video->fps);
i->video = video;
msg("video: %dx%d, fps %f\n", video->width, video->height, video->fps);
i->video = video;
+ i->video_fps = ((int)(video->fps*256))/256.0;
i->blockdiff = 64;
i->keyframe_interval = 8;
i->quality = 20;
i->blockdiff = 64;
i->keyframe_interval = 8;
i->quality = 20;
@@
-839,7
+841,7
@@
int v2swf_init(v2swf_t*v2swf, videoreader_t * video)
i->diffmode = DIFFMODE_QMEAN;
i->audio_fix = 1.0;
i->fixheader = 0;
i->diffmode = DIFFMODE_QMEAN;
i->audio_fix = 1.0;
i->fixheader = 0;
- i->framerate = video->fps;
+ i->framerate = i->video_fps;
i->fpsratio = 1.00000000000;
i->fpspos = 0.0;
i->bitrate = 32;
i->fpsratio = 1.00000000000;
i->fpspos = 0.0;
i->bitrate = 32;
@@
-932,7
+934,7
@@
void v2swf_setparameter(v2swf_t*v2swf, char*name, char*value)
i->samplerate = atoi(value);
} else if(!strcmp(name, "framerate")) {
i->framerate = atof(value);
i->samplerate = atoi(value);
} else if(!strcmp(name, "framerate")) {
i->framerate = atof(value);
- i->fpsratio = i->framerate / i->video->fps;
+ i->fpsratio = i->framerate / i->video_fps;
}
else if(!strcmp(name, "mp3_bitrate")) {
int t=0,o;
}
else if(!strcmp(name, "mp3_bitrate")) {
int t=0,o;