mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 14:26:43 +00:00
rtspsrc: Strip keys from the fmtp that we use internally in our caps
Skip keys from the fmtp, which we already use ourselves for the caps. Some software is adding random things like clock-rate into the fmtp, and we would otherwise here set a string-typed clock-rate in the caps... and thus fail to create valid RTP caps https://bugzilla.gnome.org/show_bug.cgi?id=753009
This commit is contained in:
parent
a0182dd943
commit
39a90710b7
1 changed files with 18 additions and 0 deletions
|
@ -2152,6 +2152,11 @@ gst_rtspsrc_media_to_caps (gint pt, const GstSDPMedia * media)
|
||||||
for (i = 0; pairs[i]; i++) {
|
for (i = 0; pairs[i]; i++) {
|
||||||
gchar *valpos;
|
gchar *valpos;
|
||||||
const gchar *val, *key;
|
const gchar *val, *key;
|
||||||
|
gint j;
|
||||||
|
const gchar *reserved_keys[] =
|
||||||
|
{ "media", "payload", "clock-rate", "encoding-name",
|
||||||
|
"encoding-params"
|
||||||
|
};
|
||||||
|
|
||||||
/* the key may not have a '=', the value can have other '='s */
|
/* the key may not have a '=', the value can have other '='s */
|
||||||
valpos = strstr (pairs[i], "=");
|
valpos = strstr (pairs[i], "=");
|
||||||
|
@ -2170,6 +2175,19 @@ gst_rtspsrc_media_to_caps (gint pt, const GstSDPMedia * media)
|
||||||
}
|
}
|
||||||
/* strip the key of spaces, convert key to lowercase but not the value. */
|
/* strip the key of spaces, convert key to lowercase but not the value. */
|
||||||
key = g_strstrip (pairs[i]);
|
key = g_strstrip (pairs[i]);
|
||||||
|
|
||||||
|
/* skip keys from the fmtp, which we already use ourselves for the
|
||||||
|
* caps. Some software is adding random things like clock-rate into
|
||||||
|
* the fmtp, and we would otherwise here set a string-typed clock-rate
|
||||||
|
* in the caps... and thus fail to create valid RTP caps
|
||||||
|
*/
|
||||||
|
for (j = 0; j < G_N_ELEMENTS (reserved_keys); j++) {
|
||||||
|
if (g_ascii_strcasecmp (reserved_keys[i], key) == 0) {
|
||||||
|
key = "";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (strlen (key) > 1) {
|
if (strlen (key) > 1) {
|
||||||
tmp = g_ascii_strdown (key, -1);
|
tmp = g_ascii_strdown (key, -1);
|
||||||
gst_structure_set (s, tmp, G_TYPE_STRING, val, NULL);
|
gst_structure_set (s, tmp, G_TYPE_STRING, val, NULL);
|
||||||
|
|
Loading…
Reference in a new issue