diff options
| author | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-21 09:39:22 +0000 |
|---|---|---|
| committer | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-21 09:39:22 +0000 |
| commit | 960b978a037702e3c684b66b6ab2cdd4d62c5162 (patch) | |
| tree | ca292bc48860e8d135f9e1ef3bc1c10acf52e633 /libmpcodecs/ve_xvid.c | |
| parent | 14d023a2ee8ccc35d0c0e46a8a9dc3da41328c9d (diff) | |
| download | mpv-960b978a037702e3c684b66b6ab2cdd4d62c5162.tar.bz2 mpv-960b978a037702e3c684b66b6ab2cdd4d62c5162.tar.xz | |
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
Diffstat (limited to 'libmpcodecs/ve_xvid.c')
| -rw-r--r-- | libmpcodecs/ve_xvid.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libmpcodecs/ve_xvid.c b/libmpcodecs/ve_xvid.c index bfb08b70fb..881d9508a5 100644 --- a/libmpcodecs/ve_xvid.c +++ b/libmpcodecs/ve_xvid.c @@ -378,6 +378,10 @@ config(struct vf_instance_s* vf, vbrInit(&fp->vbr_state); +#ifdef XVID_API_UNSTABLE + fp->mux->decoder_delay = enc_param.max_bframes ? 1 : 0; +#endif + return 1; } @@ -523,7 +527,10 @@ put_image(struct vf_instance_s* vf, mp_image_t *mpi) #endif // write output + if (fp->enc_frame.length > 0) muxer_write_chunk(fp->mux, fp->enc_frame.length, fp->enc_frame.intra==1 ? 0x10 : 0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + else + ++fp->mux->encoder_delay; // update the VBR engine vbrUpdate(&fp->vbr_state, enc_stats.quant, fp->enc_frame.intra, |