FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ext/lame/gstlame.*: Fix the case where you initially have stereo input, and so lame's mode is not set to mono, and th...

Browse Source 
Original commit message from CVS:
* ext/lame/gstlame.c:
* ext/lame/gstlame.h:
Fix the case where you initially have stereo input, and so lame's
mode is not set to mono, and then you get input with mono audio and
soon after you get stereo input again. What happened before this
commit is that it would keep the encoding mode as mono. It should
change it back to the one requested by the app (or the default one)
if not requested.
This commit is contained in:
Zaheer Abbas Merali 2008-01-17 17:26:48 +00:00
parent eecdae5af2
commit eb9865f6f8
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2008-01-17 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* ext/lame/gstlame.c:
* ext/lame/gstlame.h:
Fix the case where you initially have stereo input, and so lame's
mode is not set to mono, and then you get input with mono audio and
soon after you get stereo input again. What happened before this
commit is that it would keep the encoding mode as mono. It should
change it back to the one requested by the app (or the default one)
if not requested.
2008-01-15 Sebastian Dröge <slomo@circular-chaos.org> 2008-01-15 Sebastian Dröge <slomo@circular-chaos.org>
* gst/mpegaudioparse/gstmpegaudioparse.c: * gst/mpegaudioparse/gstmpegaudioparse.c:

7
ext/lame/gstlame.c
View File

@ -624,6 +624,7 @@ gst_lame_init (GstLame * lame)
lame->quality = 5; /* lame_get_quality (lame->lgf); lame->quality = 5; /* lame_get_quality (lame->lgf);
* => -1/out of range */ * => -1/out of range */
lame->mode = lame_get_mode (lame->lgf); lame->mode = lame_get_mode (lame->lgf);
lame->requested_mode = lame->mode;
lame->force_ms = lame_get_force_ms (lame->lgf); lame->force_ms = lame_get_force_ms (lame->lgf);
lame->free_format = lame_get_free_format (lame->lgf); lame->free_format = lame_get_free_format (lame->lgf);
lame->copyright = lame_get_copyright (lame->lgf); lame->copyright = lame_get_copyright (lame->lgf);
@ -741,7 +742,7 @@ gst_lame_set_property (GObject * object, guint prop_id, const GValue * value,
lame->quality = g_value_get_enum (value); lame->quality = g_value_get_enum (value);
break; break;
case ARG_MODE: case ARG_MODE:
lame->mode = g_value_get_enum (value); lame->requested_mode = g_value_get_enum (value);
break; break;
case ARG_FORCE_MS: case ARG_FORCE_MS:
lame->force_ms = g_value_get_boolean (value); lame->force_ms = g_value_get_boolean (value);
@ -856,7 +857,7 @@ gst_lame_get_property (GObject * object, guint prop_id, GValue * value,
g_value_set_enum (value, lame->quality); g_value_set_enum (value, lame->quality);
break; break;
case ARG_MODE: case ARG_MODE:
g_value_set_enum (value, lame->mode); g_value_set_enum (value, lame->requested_mode);
break; break;
case ARG_FORCE_MS: case ARG_FORCE_MS:
g_value_set_boolean (value, lame->force_ms); g_value_set_boolean (value, lame->force_ms);
@ -1207,6 +1208,8 @@ gst_lame_setup (GstLame * lame)
/* force mono encoding if we only have one channel */ /* force mono encoding if we only have one channel */
if (lame->num_channels == 1) if (lame->num_channels == 1)
lame->mode = 3; lame->mode = 3;
else
lame->mode = lame->requested_mode;
CHECK_ERROR (lame_set_num_channels (lame->lgf, lame->num_channels)); CHECK_ERROR (lame_set_num_channels (lame->lgf, lame->num_channels));
CHECK_AND_FIXUP_BITRATE (lame, "bitrate", lame->bitrate, lame->free_format); CHECK_AND_FIXUP_BITRATE (lame, "bitrate", lame->bitrate, lame->free_format);

3
ext/lame/gstlame.h
View File

@ -62,7 +62,8 @@ struct _GstLame {
gint bitrate; gint bitrate;
gfloat compression_ratio; gfloat compression_ratio;
gint quality; gint quality;
gint mode; gint mode; /* actual mode in use now */
gint requested_mode; /* requested mode by user/app */
gboolean force_ms; gboolean force_ms;
gboolean free_format; gboolean free_format;
gboolean copyright; gboolean copyright;