From: Sebastian Dröge Date: Sun, 27 Jul 2008 15:56:27 +0000 (+0000) Subject: ext/lame/gstlame.c: Use LAME's default for the min/max/mean VBR bitrate. Setting... X-Git-Tag: 1.19.3~509^2~1916^2~64 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82c528d3ca4a207e98e9414bbfe529d4d1f27769;p=platform%2Fupstream%2Fgstreamer.git ext/lame/gstlame.c: Use LAME's default for the min/max/mean VBR bitrate. Setting our own defaults will restrict the b... 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/ext/lame/gstlame.c b/ext/lame/gstlame.c index 9c167a4..90d73d2 100644 --- 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 ? */