mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

typefinding: improve iso media typefinding

Browse source 
... by also considering compatible brands rather than only aiming at major brand
(of which there are a seemingly ever expanding great many).
This commit is contained in:
Mark Nauwelaerts 2010-12-08 12:55:24 +01:00
parent 3dad049359
commit ea7349e4c7
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/typefind/gsttypefindfunctions.c
View file

@ -2545,7 +2545,26 @@ qt_type_find (GstTypeFind * tf, gpointer unused)
tip = 0; tip = 0;
break; break;
} }
size = GST_READ_UINT32_BE (data); size = GST_READ_UINT32_BE (data);
/* check compatible brands rather than ever expaning major brands above */
if ((STRNCMP (&data[4], "ftyp", 4) == 0) && (size >= 16)) {
new_offset = offset + 12;
while (new_offset + 4 <= offset + size) {
data = gst_type_find_peek (tf, new_offset, 4);
if (data == NULL)
goto done;
if (STRNCMP (&data[4], "isom", 4) == 0 ||
STRNCMP (&data[4], "avc1", 4) == 0 ||
STRNCMP (&data[4], "mp41", 4) == 0 ||
STRNCMP (&data[4], "mp42", 4) == 0) {
tip = GST_TYPE_FIND_MAXIMUM;
variant = "iso";
goto done;
}
new_offset += 4;
}
}
if (size == 1) { if (size == 1) {
guint8 *sizedata; guint8 *sizedata;
@ -2564,6 +2583,7 @@ qt_type_find (GstTypeFind * tf, gpointer unused)
offset = new_offset; offset = new_offset;
} }
done:
if (tip > 0) { if (tip > 0) {
if (variant) { if (variant) {
GstCaps *caps = gst_caps_copy (QT_CAPS); GstCaps *caps = gst_caps_copy (QT_CAPS);