mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtphdrext: Use NULL-safe case insensitive comparison

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:19:51 -04:00 committed by GStreamer Marge Bot
parent 2dd740c0c3
commit 6cd483d17a
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -387,6 +387,17 @@ gst_rtp_header_extension_set_id (GstRTPHeaderExtension * ext, guint ext_id)
priv->ext_id = ext_id; priv->ext_id = ext_id;
} }
static int
strcasecmp0 (const gchar * str1, const gchar * str2)
{
if (!str1)
return -(str1 != str2);
if (!str2)
return str1 != str2;
return g_ascii_strcasecmp (str1, str2);
}
/** /**
* gst_rtp_header_extension_set_attributes_from_caps: * gst_rtp_header_extension_set_attributes_from_caps:
* @ext: a #GstRTPHeaderExtension * @ext: a #GstRTPHeaderExtension
@ -433,7 +444,7 @@ gst_rtp_header_extension_set_attributes_from_caps (GstRTPHeaderExtension * ext,
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 (strcasecmp0 (ext_uri, gst_rtp_header_extension_get_uri (ext)) != 0) {
/* incompatible extension uri for this instance */ /* incompatible extension uri for this instance */
GST_WARNING_OBJECT (ext, "Field %s, URI doesn't match RTP Header" GST_WARNING_OBJECT (ext, "Field %s, URI doesn't match RTP Header"
" extension: \"%s\", expected \"%s\"", field_name, ext_uri, " extension: \"%s\", expected \"%s\"", field_name, ext_uri,
@ -448,15 +459,15 @@ gst_rtp_header_extension_set_attributes_from_caps (GstRTPHeaderExtension * ext,
if (G_VALUE_HOLDS_STRING (inner_val)) { if (G_VALUE_HOLDS_STRING (inner_val)) {
const gchar *dir = g_value_get_string (inner_val); const gchar *dir = g_value_get_string (inner_val);
if (!strcmp (dir, "")) if (!strcasecmp0 (dir, ""))
direction = GST_RTP_HEADER_EXTENSION_DIRECTION_DEFAULT; direction = GST_RTP_HEADER_EXTENSION_DIRECTION_DEFAULT;
else if (!strcmp (dir, "sendrecv")) else if (!strcasecmp0 (dir, "sendrecv"))
direction = GST_RTP_HEADER_EXTENSION_DIRECTION_SENDRECV; direction = GST_RTP_HEADER_EXTENSION_DIRECTION_SENDRECV;
else if (!strcmp (dir, "sendonly")) else if (!strcasecmp0 (dir, "sendonly"))
direction = GST_RTP_HEADER_EXTENSION_DIRECTION_SENDONLY; direction = GST_RTP_HEADER_EXTENSION_DIRECTION_SENDONLY;
else if (!strcmp (dir, "recvonly")) else if (!strcasecmp0 (dir, "recvonly"))
direction = GST_RTP_HEADER_EXTENSION_DIRECTION_RECVONLY; direction = GST_RTP_HEADER_EXTENSION_DIRECTION_RECVONLY;
else if (!strcmp (dir, "inactive")) else if (!strcasecmp0 (dir, "inactive"))
direction = GST_RTP_HEADER_EXTENSION_DIRECTION_INACTIVE; direction = GST_RTP_HEADER_EXTENSION_DIRECTION_INACTIVE;
else { else {
GST_WARNING_OBJECT (ext, "Unexpected direction \"%s\", expected one" GST_WARNING_OBJECT (ext, "Unexpected direction \"%s\", expected one"
@ -476,7 +487,7 @@ gst_rtp_header_extension_set_attributes_from_caps (GstRTPHeaderExtension * ext,
goto done; goto done;
} }
if (g_strcmp0 (g_value_get_string (inner_val), if (strcasecmp0 (g_value_get_string (inner_val),
gst_rtp_header_extension_get_uri (ext)) != 0) { gst_rtp_header_extension_get_uri (ext)) != 0) {
GST_WARNING_OBJECT (ext, "URI doesn't match RTP Header extension:" GST_WARNING_OBJECT (ext, "URI doesn't match RTP Header extension:"
" \"%s\", expected \"%s\"", g_value_get_string (inner_val), " \"%s\", expected \"%s\"", g_value_get_string (inner_val),