[0.11] gst-ffmpeg: ffdec: Correctly set the channel-mask and also set it for stereo

Sebastian Dröge slomo at kemper.freedesktop.org
Mon Jan 9 04:27:03 PST 2012


Module: gst-ffmpeg
Branch: 0.11
Commit: a861ea34dd36354ee3540cca22077e4fdac4404e
URL:    http://cgit.freedesktop.org/gstreamer/gst-ffmpeg/commit/?id=a861ea34dd36354ee3540cca22077e4fdac4404e

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Jan  9 13:23:29 2012 +0100

ffdec: Correctly set the channel-mask and also set it for stereo

---

 ext/ffmpeg/gstffmpegcodecmap.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index e4f5210..7483854 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -168,11 +168,6 @@ gst_ff_channel_layout_to_gst (guint64 channel_layout, guint channels)
     GST_DEBUG ("mono common case; won't set channel positions");
     g_free (pos);
     pos = NULL;
-  } else if (nchannels == 2 && pos[0] == GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT
-      && pos[1] == GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT) {
-    GST_DEBUG ("stereo common case; won't set channel positions");
-    g_free (pos);
-    pos = NULL;
   }
 
   return pos;
@@ -374,7 +369,7 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id,
       guint64 mask;
 
       if (gst_audio_channel_positions_to_mask (pos, context->channels, &mask)) {
-        gst_caps_set_simple (caps, "channel-mask", GST_TYPE_BITMASK, &mask,
+        gst_caps_set_simple (caps, "channel-mask", GST_TYPE_BITMASK, mask,
             NULL);
       }
       g_free (pos);



More information about the gstreamer-commits mailing list