From 15d276058ead53b70341ce449e0f18a914e0a8ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Cr=C3=AAte?= Date: Thu, 6 Mar 2014 12:06:43 -0500 Subject: [PATCH] rtp: Remove caps restrictions from RTP depayloader sink caps Remove caps restrictions that correspond to the default and are not required in SDP. With the new usage of having pads require a subset of the caps, they will make the negotiation fail. --- gst/rtp/gstrtpamrdepay.c | 6 ++++-- gst/rtp/gstrtpilbcdepay.c | 4 ++-- gst/rtp/gstrtpsirendepay.c | 4 +++- gst/rtp/gstrtpspeexdepay.c | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gst/rtp/gstrtpamrdepay.c b/gst/rtp/gstrtpamrdepay.c index e1208bfad0..4c6b7224cd 100644 --- a/gst/rtp/gstrtpamrdepay.c +++ b/gst/rtp/gstrtpamrdepay.c @@ -78,7 +78,8 @@ static GstStaticPadTemplate gst_rtp_amr_depay_sink_template = "media = (string) \"audio\", " "clock-rate = (int) 8000, " "encoding-name = (string) \"AMR\", " - "encoding-params = (string) \"1\", " + /* This is the default, so the peer doesn't have to specify it + * "encoding-params = (string) \"1\", " */ /* NOTE that all values must be strings in orde to be able to do SDP <-> * GstCaps mapping. */ "octet-align = (string) \"1\";" @@ -97,7 +98,8 @@ static GstStaticPadTemplate gst_rtp_amr_depay_sink_template = "media = (string) \"audio\", " "clock-rate = (int) 16000, " "encoding-name = (string) \"AMR-WB\", " - "encoding-params = (string) \"1\", " + /* This is the default, so the peer doesn't have to specify it + * "encoding-params = (string) \"1\", " */ /* NOTE that all values must be strings in orde to be able to do SDP <-> * GstCaps mapping. */ "octet-align = (string) \"1\";" diff --git a/gst/rtp/gstrtpilbcdepay.c b/gst/rtp/gstrtpilbcdepay.c index 8b4285e1c7..5c7dc25475 100644 --- a/gst/rtp/gstrtpilbcdepay.c +++ b/gst/rtp/gstrtpilbcdepay.c @@ -49,8 +49,8 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"audio\", " "clock-rate = (int) 8000, " - "encoding-name = (string) \"ILBC\", " - "mode = (string) { \"20\", \"30\" }") + "encoding-name = (string) \"ILBC\"") + /* "mode = (string) { \"20\", \"30\" }" */ ); static GstStaticPadTemplate gst_rtp_ilbc_depay_src_template = diff --git a/gst/rtp/gstrtpsirendepay.c b/gst/rtp/gstrtpsirendepay.c index 9d1e1ef62d..1bbbda7887 100644 --- a/gst/rtp/gstrtpsirendepay.c +++ b/gst/rtp/gstrtpsirendepay.c @@ -35,7 +35,9 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"audio\", " "clock-rate = (int) 16000, " - "encoding-name = (string) \"SIREN\", " "dct-length = (int) 320") + "encoding-name = (string) \"SIREN\"") + /* This is the default, so the peer doesn't have to specify it */ + /* " "dct-length = (int) 320") */ ); static GstStaticPadTemplate gst_rtp_siren_depay_src_template = diff --git a/gst/rtp/gstrtpspeexdepay.c b/gst/rtp/gstrtpspeexdepay.c index 5a61fdaa7a..34aef390a3 100644 --- a/gst/rtp/gstrtpspeexdepay.c +++ b/gst/rtp/gstrtpspeexdepay.c @@ -46,7 +46,7 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_CAPS ("application/x-rtp, " "media = (string) \"audio\", " "clock-rate = (int) [6000, 48000], " - "encoding-name = (string) \"SPEEX\", ") + "encoding-name = (string) \"SPEEX\"") /* "encoding-params = (string) \"1\"" */ ); -- 2.34.1