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.
This commit is contained in:
Olivier Crête 2014-03-06 12:06:43 -05:00
parent 5a9b988b85
commit 15d276058e
4 changed files with 10 additions and 6 deletions

View file

@ -78,7 +78,8 @@ static GstStaticPadTemplate gst_rtp_amr_depay_sink_template =
"media = (string) \"audio\", " "media = (string) \"audio\", "
"clock-rate = (int) 8000, " "clock-rate = (int) 8000, "
"encoding-name = (string) \"AMR\", " "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 <-> /* NOTE that all values must be strings in orde to be able to do SDP <->
* GstCaps mapping. */ * GstCaps mapping. */
"octet-align = (string) \"1\";" "octet-align = (string) \"1\";"
@ -97,7 +98,8 @@ static GstStaticPadTemplate gst_rtp_amr_depay_sink_template =
"media = (string) \"audio\", " "media = (string) \"audio\", "
"clock-rate = (int) 16000, " "clock-rate = (int) 16000, "
"encoding-name = (string) \"AMR-WB\", " "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 <-> /* NOTE that all values must be strings in orde to be able to do SDP <->
* GstCaps mapping. */ * GstCaps mapping. */
"octet-align = (string) \"1\";" "octet-align = (string) \"1\";"

View file

@ -49,8 +49,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
GST_STATIC_CAPS ("application/x-rtp, " GST_STATIC_CAPS ("application/x-rtp, "
"media = (string) \"audio\", " "media = (string) \"audio\", "
"clock-rate = (int) 8000, " "clock-rate = (int) 8000, "
"encoding-name = (string) \"ILBC\", " "encoding-name = (string) \"ILBC\"")
"mode = (string) { \"20\", \"30\" }") /* "mode = (string) { \"20\", \"30\" }" */
); );
static GstStaticPadTemplate gst_rtp_ilbc_depay_src_template = static GstStaticPadTemplate gst_rtp_ilbc_depay_src_template =

View file

@ -35,7 +35,9 @@ GST_STATIC_PAD_TEMPLATE ("sink",
GST_STATIC_CAPS ("application/x-rtp, " GST_STATIC_CAPS ("application/x-rtp, "
"media = (string) \"audio\", " "media = (string) \"audio\", "
"clock-rate = (int) 16000, " "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 = static GstStaticPadTemplate gst_rtp_siren_depay_src_template =

View file

@ -46,7 +46,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
GST_STATIC_CAPS ("application/x-rtp, " GST_STATIC_CAPS ("application/x-rtp, "
"media = (string) \"audio\", " "media = (string) \"audio\", "
"clock-rate = (int) [6000, 48000], " "clock-rate = (int) [6000, 48000], "
"encoding-name = (string) \"SPEEX\", ") "encoding-name = (string) \"SPEEX\"")
/* "encoding-params = (string) \"1\"" */ /* "encoding-params = (string) \"1\"" */
); );