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_lavc.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_lavc.c')
-rw-r--r-- | libmpcodecs/ve_lavc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index afc5f787a7..8e8f2ff793 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -770,6 +770,8 @@ static int config(struct vf_instance_s* vf, mux_v->bih->biSize= sizeof(BITMAPINFOHEADER) + lavc_venc_context->extradata_size; } + mux_v->decoder_delay = lavc_venc_context->max_b_frames ? 1 : 0; + return 1; } @@ -854,8 +856,10 @@ static int encode_frame(struct vf_instance_s* vf, AVFrame *pic){ out_size = avcodec_encode_video(lavc_venc_context, mux_v->buffer, mux_v->buffer_size, pic); - if(out_size == 0) + if(out_size == 0) { + ++mux_v->encoder_delay; return 0; + } muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); |