mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 03:31:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtphdrext: Print warnings when trying to parse caps

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/906>
This commit is contained in:
Olivier Crête 2021-09-27 10:01:02 -04:00 committed by GStreamer Marge Bot
parent 5ec82c1c4e
commit 2dd740c0c3
1 changed files with 40 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
subprojects/gst-plugins-base/gst-libs/gst/rtp/gstrtphdrext.c
View file

@ -415,7 +415,7 @@ gst_rtp_header_extension_set_attributes_from_caps (GstRTPHeaderExtension * ext,
GstRTPHeaderExtensionDirection direction = GstRTPHeaderExtensionDirection direction =
GST_RTP_HEADER_EXTENSION_DIRECTION_DEFAULT; GST_RTP_HEADER_EXTENSION_DIRECTION_DEFAULT;
const gchar *attributes = ""; const gchar *attributes = "";
gboolean ret = TRUE; gboolean ret = FALSE;
g_return_val_if_fail (GST_IS_CAPS (caps), FALSE); g_return_val_if_fail (GST_IS_CAPS (caps), FALSE);
g_return_val_if_fail (gst_caps_is_fixed (caps), FALSE); g_return_val_if_fail (gst_caps_is_fixed (caps), FALSE);
@ -429,14 +429,16 @@ gst_rtp_header_extension_set_attributes_from_caps (GstRTPHeaderExtension * ext,
g_return_val_if_fail (gst_structure_has_field (structure, field_name), FALSE); g_return_val_if_fail (gst_structure_has_field (structure, field_name), FALSE);
val = gst_structure_get_value (structure, field_name); val = gst_structure_get_value (structure, field_name);
g_free (field_name);
if (G_VALUE_HOLDS_STRING (val)) { if (G_VALUE_HOLDS_STRING (val)) {
const gchar *ext_uri = g_value_get_string (val); const gchar *ext_uri = g_value_get_string (val);
if (g_strcmp0 (ext_uri, gst_rtp_header_extension_get_uri (ext)) != 0) { if (g_strcmp0 (ext_uri, gst_rtp_header_extension_get_uri (ext)) != 0) {
/* incompatible extension uri for this instance */ /* incompatible extension uri for this instance */
goto error; GST_WARNING_OBJECT (ext, "Field %s, URI doesn't match RTP Header"
" extension: \"%s\", expected \"%s\"", field_name, ext_uri,
gst_rtp_header_extension_get_uri (ext));
goto done;
} }
} else if (GST_VALUE_HOLDS_ARRAY (val) } else if (GST_VALUE_HOLDS_ARRAY (val)
&& gst_value_array_get_size (val) == 3) { && gst_value_array_get_size (val) == 3) {
@ -456,39 +458,60 @@ gst_rtp_header_extension_set_attributes_from_caps (GstRTPHeaderExtension * ext,
direction = GST_RTP_HEADER_EXTENSION_DIRECTION_RECVONLY; direction = GST_RTP_HEADER_EXTENSION_DIRECTION_RECVONLY;
else if (!strcmp (dir, "inactive")) else if (!strcmp (dir, "inactive"))
direction = GST_RTP_HEADER_EXTENSION_DIRECTION_INACTIVE; direction = GST_RTP_HEADER_EXTENSION_DIRECTION_INACTIVE;
else else {
goto error; GST_WARNING_OBJECT (ext, "Unexpected direction \"%s\", expected one"
" of: sendrecv, sendonly, recvonly or inactive", dir);
goto done;
}
} else { } else {
goto error; GST_WARNING_OBJECT (ext, "Caps should hold an array of 3 strings, "
"but first member is %s instead", G_VALUE_TYPE_NAME (inner_val));
goto done;
} }
inner_val = gst_value_array_get_value (val, 1); inner_val = gst_value_array_get_value (val, 1);
if (!G_VALUE_HOLDS_STRING (inner_val)) if (!G_VALUE_HOLDS_STRING (inner_val)) {
goto error; GST_WARNING_OBJECT (ext, "Caps should hold an array of 3 strings, "
"but second member is %s instead", G_VALUE_TYPE_NAME (inner_val));
goto done;
}
if (g_strcmp0 (g_value_get_string (inner_val), if (g_strcmp0 (g_value_get_string (inner_val),
gst_rtp_header_extension_get_uri (ext)) != 0) gst_rtp_header_extension_get_uri (ext)) != 0) {
goto error; GST_WARNING_OBJECT (ext, "URI doesn't match RTP Header extension:"
" \"%s\", expected \"%s\"", g_value_get_string (inner_val),
gst_rtp_header_extension_get_uri (ext));
goto done;
}
inner_val = gst_value_array_get_value (val, 2); inner_val = gst_value_array_get_value (val, 2);
if (!G_VALUE_HOLDS_STRING (inner_val)) if (!G_VALUE_HOLDS_STRING (inner_val)) {
goto error; GST_WARNING_OBJECT (ext, "Caps should hold an array of 3 strings, "
"but third member is %s instead", G_VALUE_TYPE_NAME (inner_val));
goto done;
}
attributes = g_value_get_string (inner_val); attributes = g_value_get_string (inner_val);
} else { } else {
/* unknown caps format */ GST_WARNING_OBJECT (ext, "Caps field %s should be either a string"
goto error; " containing the URI or an array of 3 strings containing the"
" direction, URI and attributes, but contains %s", field_name,
G_VALUE_TYPE_NAME (val));
goto done;
} }
if (klass->set_attributes) if (klass->set_attributes)
ret = klass->set_attributes (ext, direction, attributes); ret = klass->set_attributes (ext, direction, attributes);
else
ret = TRUE;
if (ret) if (ret)
priv->direction = direction; priv->direction = direction;
return ret; done:
error: g_free (field_name);
return FALSE; return ret;
} }
/** /**