[vlc-commits] commit: avcodec: don't play rc-max/min for vp8, doesn' t seem to work as it worked before (Ilkka Ollakka )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Jun 13 16:35:47 2010 +0300| [d8cc33fe3dfe66b074f3041051e87dfba043df4b] | committer: Ilkka Ollakka 

avcodec: don't play rc-max/min for vp8, doesn't seem to work as it worked before
(cherry picked from commit 734045e35ceacde089a76c6bf65474bca10f1e94)

Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=d8cc33fe3dfe66b074f3041051e87dfba043df4b
---

 modules/codec/avcodec/encoder.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index 6956f2a..a96f0fc 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -589,6 +589,10 @@ int OpenEncoder( vlc_object_t *p_this )
         /* default to 120 frames between keyframe */
         if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "keyint" ) )
            p_context->gop_size = 120;
+        /* Don't set rc-values atm, they were from time before
+           libvpx was officially in ffmpeg */
+        //p_context->rc_max_rate = 24 * 1000 * 1000; //24M
+        //p_context->rc_min_rate = 40 * 1000; // 40k
         /* seems that ffmpeg presets have 720p as divider for buffers */
         if( p_enc->fmt_out.video.i_height >= 720 )
         {
@@ -605,17 +609,12 @@ int OpenEncoder( vlc_object_t *p_this )
               p_context->mb_lmax = p_context->lmax = 42 * FF_QP2LAMBDA;
            }
 
-           p_context->rc_max_rate = 24 * 1000 * 1000; //24M
-           p_context->rc_min_rate = 100 * 1000; // 100k
         } else {
            if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
            {
               p_context->mb_qmin = p_context->qmin = 1;
               p_context->mb_lmin = p_context->lmin = FF_QP2LAMBDA;
            }
-
-           p_context->rc_max_rate = 1.5 * 1000 * 1000; //1.5M
-           p_context->rc_min_rate = 40 * 1000; // 40k
         }