From 960b978a037702e3c684b66b6ab2cdd4d62c5162 Mon Sep 17 00:00:00 2001 From: corey Date: Tue, 21 Feb 2006 09:39:22 +0000 Subject: Fix video delay when encoding with B-frames. Encoding delay is adjusted for on-the-fly during encoding. Decoding delay is compensated for by setting an appropriate dwStart on the audio stream (only in muxer_avi at this point). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17660 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/muxer_avi.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'libmpdemux') diff --git a/libmpdemux/muxer_avi.c b/libmpdemux/muxer_avi.c index 7b3a32413e..9bd367df0b 100644 --- a/libmpdemux/muxer_avi.c +++ b/libmpdemux/muxer_avi.c @@ -665,10 +665,19 @@ static void avifile_write_index(muxer_t *muxer){ } } +static void avifile_fix_parameters(muxer_stream_t *s){ + /* adjust audio_delay_fix according to individual stream delay */ + if (s->type == MUXER_TYPE_AUDIO) + s->muxer->audio_delay_fix -= (float)s->decoder_delay * s->h.dwScale/s->h.dwRate; + if (s->type == MUXER_TYPE_VIDEO) + s->muxer->audio_delay_fix += (float)s->decoder_delay * s->h.dwScale/s->h.dwRate; +} + int muxer_init_muxer_avi(muxer_t *muxer){ muxer->cont_new_stream = &avifile_new_stream; muxer->cont_write_chunk = &avifile_write_chunk; muxer->cont_write_header = &avifile_write_header; muxer->cont_write_index = &avifile_write_index; + muxer->fix_stream_parameters = &avifile_fix_parameters; return 1; } -- cgit v1.2.3