mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 02:01:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

typefindfunctions: Use memcmp() instead of a strange macro around strncmp()

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1234>
This commit is contained in:
Sebastian Dröge 2021-10-23 16:06:54 +03:00 committed by GStreamer Marge Bot
parent 37a744889c
commit 23a06f7a31
1 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
subprojects/gst-plugins-base/gst/typefind/gsttypefindfunctions.c
View file

@ -3385,7 +3385,6 @@ jpc_type_find (GstTypeFind * tf, gpointer unused)
static GstStaticCaps qt_caps = GST_STATIC_CAPS ("video/quicktime"); static GstStaticCaps qt_caps = GST_STATIC_CAPS ("video/quicktime");
#define QT_CAPS gst_static_caps_get(&qt_caps) #define QT_CAPS gst_static_caps_get(&qt_caps)
#define STRNCMP(x,y,z) (strncmp ((char*)(x), (char*)(y), z))
static gboolean static gboolean
ftyp_brand_is (const guint8 * brand, const gchar * brands[], gsize n_brands) ftyp_brand_is (const guint8 * brand, const gchar * brands[], gsize n_brands)
@ -3393,7 +3392,7 @@ ftyp_brand_is (const guint8 * brand, const gchar * brands[], gsize n_brands)
gsize i; gsize i;
for (i = 0; i < n_brands; i++) { for (i = 0; i < n_brands; i++) {
if (STRNCMP (brand, brands[i], 4) == 0) if (memcmp (brand, brands[i], 4) == 0)
return TRUE; return TRUE;
} }
@ -3460,7 +3459,7 @@ qt_type_find (GstTypeFind * tf, gpointer unused)
while ((data = gst_type_find_peek (tf, offset, 12)) != NULL) { while ((data = gst_type_find_peek (tf, offset, 12)) != NULL) {
guint64 new_offset; guint64 new_offset;
if (STRNCMP (&data[4], "ftyp", 4) == 0) { if (memcmp (&data[4], "ftyp", 4) == 0) {
if (ftyp_brand_is (&data[8], qt_brands, G_N_ELEMENTS (qt_brands))) { if (ftyp_brand_is (&data[8], qt_brands, G_N_ELEMENTS (qt_brands))) {
tip = GST_TYPE_FIND_MAXIMUM; tip = GST_TYPE_FIND_MAXIMUM;
break; break;
@ -3499,31 +3498,31 @@ qt_type_find (GstTypeFind * tf, gpointer unused)
} }
/* top-level box/atom types that are in common with ISO base media file format */ /* top-level box/atom types that are in common with ISO base media file format */
if (STRNCMP (&data[4], "moov", 4) == 0 || if (memcmp (&data[4], "moov", 4) == 0 ||
STRNCMP (&data[4], "mdat", 4) == 0 || memcmp (&data[4], "mdat", 4) == 0 ||
STRNCMP (&data[4], "ftyp", 4) == 0 || memcmp (&data[4], "ftyp", 4) == 0 ||
STRNCMP (&data[4], "free", 4) == 0 || memcmp (&data[4], "free", 4) == 0 ||
STRNCMP (&data[4], "uuid", 4) == 0 || memcmp (&data[4], "uuid", 4) == 0 ||
STRNCMP (&data[4], "udta", 4) == 0 || memcmp (&data[4], "udta", 4) == 0 ||
STRNCMP (&data[4], "styp", 4) == 0 || memcmp (&data[4], "styp", 4) == 0 ||
STRNCMP (&data[4], "sidx", 4) == 0 || memcmp (&data[4], "sidx", 4) == 0 ||
STRNCMP (&data[4], "ssix", 4) == 0 || memcmp (&data[4], "ssix", 4) == 0 ||
STRNCMP (&data[4], "prft", 4) == 0 || memcmp (&data[4], "prft", 4) == 0 ||
STRNCMP (&data[4], "emsg", 4) == 0 || memcmp (&data[4], "emsg", 4) == 0 ||
STRNCMP (&data[4], "moof", 4) == 0 || memcmp (&data[4], "moof", 4) == 0 ||
STRNCMP (&data[4], "mfra", 4) == 0 || memcmp (&data[4], "mfra", 4) == 0 ||
STRNCMP (&data[4], "pdin", 4) == 0 || memcmp (&data[4], "pdin", 4) == 0 ||
STRNCMP (&data[4], "meta", 4) == 0 || memcmp (&data[4], "meta", 4) == 0 ||
STRNCMP (&data[4], "skip", 4) == 0) { memcmp (&data[4], "skip", 4) == 0) {
if (tip == 0) { if (tip == 0) {
tip = GST_TYPE_FIND_LIKELY; tip = GST_TYPE_FIND_LIKELY;
} else { } else {
tip = GST_TYPE_FIND_NEARLY_CERTAIN; tip = GST_TYPE_FIND_NEARLY_CERTAIN;
} }
if (STRNCMP (&data[4], "moov", 4) == 0) if (memcmp (&data[4], "moov", 4) == 0)
have_moov = TRUE; have_moov = TRUE;
if (STRNCMP (&data[4], "mdat", 4) == 0) if (memcmp (&data[4], "mdat", 4) == 0)
have_mdat = TRUE; have_mdat = TRUE;
atoms_in_a_row += 1; atoms_in_a_row += 1;
@ -3533,10 +3532,10 @@ qt_type_find (GstTypeFind * tf, gpointer unused)
} }
} }
/* other box/atom types, apparently quicktime specific */ /* other box/atom types, apparently quicktime specific */
else if (STRNCMP (&data[4], "pnot", 4) == 0 || else if (memcmp (&data[4], "pnot", 4) == 0 ||
STRNCMP (&data[4], "PICT", 4) == 0 || memcmp (&data[4], "PICT", 4) == 0 ||
STRNCMP (&data[4], "wide", 4) == 0 || memcmp (&data[4], "wide", 4) == 0 ||
STRNCMP (&data[4], "prfl", 4) == 0) { memcmp (&data[4], "prfl", 4) == 0) {
tip = GST_TYPE_FIND_MAXIMUM; tip = GST_TYPE_FIND_MAXIMUM;
break; break;
} else { } else {
@ -3551,7 +3550,7 @@ qt_type_find (GstTypeFind * tf, gpointer unused)
if (size + offset >= G_MAXINT64) if (size + offset >= G_MAXINT64)
break; break;
/* check compatible brands rather than ever expanding major brands above */ /* check compatible brands rather than ever expanding major brands above */
if ((STRNCMP (&data[4], "ftyp", 4) == 0) && (size >= 16)) { if ((memcmp (&data[4], "ftyp", 4) == 0) && (size >= 16)) {
data = gst_type_find_peek (tf, offset, size); data = gst_type_find_peek (tf, offset, size);
if (data == NULL) if (data == NULL)
goto done; goto done;
@ -3657,9 +3656,9 @@ qtif_type_find (GstTypeFind * tf, gpointer unused)
if (size < 8) if (size < 8)
break; break;
if (STRNCMP (data + 4, "idsc", 4) == 0) if (memcmp (data + 4, "idsc", 4) == 0)
found_idsc = TRUE; found_idsc = TRUE;
if (STRNCMP (data + 4, "idat", 4) == 0) if (memcmp (data + 4, "idat", 4) == 0)
found_idat = TRUE; found_idat = TRUE;
if (found_idsc && found_idat) { if (found_idsc && found_idat) {