[MPlayer-cvslog] CVS: main/libmpcodecs ve_lavc.c,1.128,1.129

[Michael Niedermayer CVS]

CVS change done by Michael Niedermayer CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv23800/libmpcodecs

Modified Files:
	ve_lavc.c 
Log Message:
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


Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- ve_lavc.c	24 Jan 2006 23:50:41 -0000	1.128
+++ ve_lavc.c	25 Jan 2006 01:17:57 -0000	1.129
@@ -362,6 +362,9 @@
 	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 @@
     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;