[0.11] gst-plugins-good: replaygain: Update for the new audio caps

Sebastian Dröge slomo at kemper.freedesktop.org
Thu Jan 5 01:37:29 PST 2012


Module: gst-plugins-good
Branch: 0.11
Commit: 7459bdd414590f9b473a9e8f898365c2ba6bc6f8
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=7459bdd414590f9b473a9e8f898365c2ba6bc6f8

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Wed Jan  4 11:57:20 2012 +0100

replaygain: Update for the new audio caps

---

 gst/replaygain/gstrganalysis.c |   10 +++++++++-
 gst/replaygain/gstrglimiter.c  |    2 ++
 gst/replaygain/gstrgvolume.c   |    2 ++
 3 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/gst/replaygain/gstrganalysis.c b/gst/replaygain/gstrganalysis.c
index b7c30c6..ab6dd73 100644
--- a/gst/replaygain/gstrganalysis.c
+++ b/gst/replaygain/gstrganalysis.c
@@ -105,7 +105,15 @@ enum
  * "usual" sample rates in the 8000 to 48000 Hz range. */
 #define REPLAY_GAIN_CAPS "audio/x-raw," \
   "format = (string) { "GST_AUDIO_NE(F32)","GST_AUDIO_NE(S16)" }, "     \
-  "channels = (int) { 1, 2 }, "                                         \
+  "layout = (string) interleaved, "                                     \
+  "channels = (int) 1, "                                                \
+  "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, "     \
+  "44100, 48000 }; "                                                    \
+  "audio/x-raw,"                                                        \
+  "format = (string) { "GST_AUDIO_NE(F32)","GST_AUDIO_NE(S16)" }, "     \
+  "layout = (string) interleaved, "                                     \
+  "channels = (int) 2, "                                                \
+  "channel-mask = (bitmask) 0x3, "                                      \
   "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, "     \
   "44100, 48000 }"
 
diff --git a/gst/replaygain/gstrglimiter.c b/gst/replaygain/gstrglimiter.c
index 3291f6d..8e91f8b 100644
--- a/gst/replaygain/gstrglimiter.c
+++ b/gst/replaygain/gstrglimiter.c
@@ -63,6 +63,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
         "format = (string) " GST_AUDIO_NE (F32) ", "
+        "layout = (string) { interleaved, non-interleaved }, "
         "channels = (int) [1, MAX], " "rate = (int) [1, MAX]"));
 
 static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
@@ -70,6 +71,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
         "format = (string) " GST_AUDIO_NE (F32) ", "
+        "layout = (string) { interleaved, non-interleaved}, "
         "channels = (int) [1, MAX], " "rate = (int) [1, MAX]"));
 
 #define gst_rg_limiter_parent_class parent_class
diff --git a/gst/replaygain/gstrgvolume.c b/gst/replaygain/gstrgvolume.c
index 0372ca7..fcbd622 100644
--- a/gst/replaygain/gstrgvolume.c
+++ b/gst/replaygain/gstrgvolume.c
@@ -104,6 +104,7 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
         "format = (string) " FORMAT ", "
+        "layout = (string) { interleaved, non-interleaved }, "
         "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ]"));
 
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
@@ -111,6 +112,7 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
         "format = (string) " FORMAT ", "
+        "layout = (string) { interleaved, non-interleaved }, "
         "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ]"));
 
 #define gst_rg_volume_parent_class parent_class



More information about the gstreamer-commits mailing list