From eb9865f6f8b68d7bd2ad71f9217a5097224ec89c Mon Sep 17 00:00:00 2001
From: Zaheer Abbas Merali <zaheerabbas@merali.org>
Date: Thu, 17 Jan 2008 17:26:48 +0000
Subject: [PATCH] ext/lame/gstlame.*: Fix the case where you initially have
 stereo input, and so lame's mode is not set to mono, and th...

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.
---
 ChangeLog          | 11 +++++++++++
 ext/lame/gstlame.c |  7 +++++--
 ext/lame/gstlame.h |  3 ++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47e6d379ef..5b843ef758 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* gst/mpegaudioparse/gstmpegaudioparse.c:
diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c
index 71576af2ba..bee623c378 100644
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
@@ -624,6 +624,7 @@ gst_lame_init (GstLame * lame)
   lame->quality = 5;            /* lame_get_quality (lame->lgf);
                                  * => -1/out of range */
   lame->mode = lame_get_mode (lame->lgf);
+  lame->requested_mode = lame->mode;
   lame->force_ms = lame_get_force_ms (lame->lgf);
   lame->free_format = lame_get_free_format (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);
       break;
     case ARG_MODE:
-      lame->mode = g_value_get_enum (value);
+      lame->requested_mode = g_value_get_enum (value);
       break;
     case ARG_FORCE_MS:
       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);
       break;
     case ARG_MODE:
-      g_value_set_enum (value, lame->mode);
+      g_value_set_enum (value, lame->requested_mode);
       break;
     case ARG_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 */
   if (lame->num_channels == 1)
     lame->mode = 3;
+  else
+    lame->mode = lame->requested_mode;
 
   CHECK_ERROR (lame_set_num_channels (lame->lgf, lame->num_channels));
   CHECK_AND_FIXUP_BITRATE (lame, "bitrate", lame->bitrate, lame->free_format);
diff --git a/ext/lame/gstlame.h b/ext/lame/gstlame.h
index bcae3399e2..45abe0e46d 100644
--- a/ext/lame/gstlame.h
+++ b/ext/lame/gstlame.h
@@ -62,7 +62,8 @@ struct _GstLame {
   gint bitrate;
   gfloat compression_ratio;
   gint quality;
-  gint mode;
+  gint mode; /* actual mode in use now */
+  gint requested_mode; /* requested mode by user/app */
   gboolean force_ms;
   gboolean free_format;
   gboolean copyright;