ext/lame/gstlame.c: Use LAME's default for the min/max/mean VBR bitrate. Setting...

Original commit message from CVS:
* ext/lame/gstlame.c: (gst_lame_init):
Use LAME's default for the min/max/mean VBR bitrate. Setting our own
defaults will restrict the bitrate when using the presets in a bad way.
Fixes bug #498004.

diff --git a/ChangeLog b/ChangeLog
index e7dd837081c0b650a7ef2724a3833f68b9fe3cca..eb2f3eea2e9df6e5739b7c8f24cca022b8d124f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-27  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+       * ext/lame/gstlame.c: (gst_lame_init):
+       Use LAME's default for the min/max/mean VBR bitrate. Setting our own
+       defaults will restrict the bitrate when using the presets in a bad way.
+       Fixes bug #498004.
+
 2008-07-27  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
        * ext/lame/gstlame.c: (gst_lame_sink_setcaps):

diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c
index 9c167a48708a88f23cd10023a7a6de393434d4f6..90d73d24003abe0bf6b7d674788b01d244f5f25b 100644 (file)
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
@@ -630,18 +630,13 @@ gst_lame_init (GstLame * lame)
   lame->disable_reservoir = lame_get_disable_reservoir (lame->lgf);
   lame->vbr = vbr_off;          /* lame_get_VBR (lame->lgf); */
   lame->vbr_quality = 5;
-#if 0
+
   /* Replaced by our own more informative constants, 
      rather than LAME's defaults */
   lame->vbr_mean_bitrate = lame_get_VBR_mean_bitrate_kbps (lame->lgf);
   lame->vbr_min_bitrate = lame_get_VBR_min_bitrate_kbps (lame->lgf);
-  lame->vbr_max_bitrate = 0;    /* lame_get_VBR_max_bitrate_kbps (lame->lgf);
-                                 * => 0/no vbr possible */
-#else
-  lame->vbr_mean_bitrate = DEFAULT_MEAN_VBR_BITRATE;
-  lame->vbr_min_bitrate = DEFAULT_MIN_VBR_BITRATE;
-  lame->vbr_max_bitrate = DEFAULT_MAX_VBR_BITRATE;
-#endif
+  lame->vbr_max_bitrate = lame_get_VBR_max_bitrate_kbps (lame->lgf);
+  /* => 0/no vbr possible */
   lame->vbr_hard_min = lame_get_VBR_hard_min (lame->lgf);
   /* lame->lowpass_freq = 50000;    lame_get_lowpassfreq (lame->lgf);
    * => 0/lowpass on everything ? */