diff options
author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-25 01:17:57 +0000 |
---|---|---|
committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-25 01:17:57 +0000 |
commit | 590e8e71533bb41d7323f158356aa09b209b36b5 (patch) | |
tree | 8b7af270f10c8982f1b4c0c638a504ae30a6e8f8 /libmpcodecs | |
parent | 510f186efffc1b3bf282b29e7f2a6b3401e41618 (diff) | |
download | mpv-590e8e71533bb41d7323f158356aa09b209b36b5.tar.bz2 mpv-590e8e71533bb41d7323f158356aa09b209b36b5.tar.xz |
pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
make a few things like mux_rate, mux_max_delay, ... user settable
fixed buffer underflow errors when muxing to mpeg-ps
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17481 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ve_lavc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index c2aedd59db..61d458e45c 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -362,6 +362,9 @@ static int config(struct vf_instance_s* vf, lavc_venc_context->bit_rate = lavc_param_vbitrate*1000; else lavc_venc_context->bit_rate = 800000; /* default */ + + //mux_v->wf->nAvgBytesPerSec= lavc_venc_context->bit_rate/8; + lavc_venc_context->bit_rate_tolerance= lavc_param_vrate_tolerance*1000; #if LIBAVCODEC_BUILD >= 4754 lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate}; @@ -402,9 +405,14 @@ static int config(struct vf_instance_s* vf, lavc_venc_context->rc_qmod_amp= lavc_param_rc_qmod_amp; lavc_venc_context->rc_qmod_freq= lavc_param_rc_qmod_freq; lavc_venc_context->rc_eq= lavc_param_rc_eq; + + mux_v->max_rate= lavc_venc_context->rc_max_rate= lavc_param_rc_max_rate*1000; lavc_venc_context->rc_min_rate= lavc_param_rc_min_rate*1000; + + mux_v->vbv_size= lavc_venc_context->rc_buffer_size= lavc_param_rc_buffer_size*1000; + lavc_venc_context->rc_initial_buffer_occupancy= lavc_venc_context->rc_buffer_size * lavc_param_rc_initial_buffer_occupancy; |