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

qtdemux: Parse styp box for informational purposes

Browse source 
And include some more details in the debug logs for the ftyp box too.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2453>
This commit is contained in:
Sebastian Dröge 2022-05-19 11:06:31 +03:00 committed by GStreamer Marge Bot
parent 85b53bb65d
commit 04f6258863
2 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
subprojects/gst-plugins-good/gst/isomp4/fourcc.h
View file

@ -144,6 +144,7 @@ G_BEGIN_DECLS
#define FOURCC_free GST_MAKE_FOURCC('f','r','e','e') #define FOURCC_free GST_MAKE_FOURCC('f','r','e','e')
#define FOURCC_frma GST_MAKE_FOURCC('f','r','m','a') #define FOURCC_frma GST_MAKE_FOURCC('f','r','m','a')
#define FOURCC_ftyp GST_MAKE_FOURCC('f','t','y','p') #define FOURCC_ftyp GST_MAKE_FOURCC('f','t','y','p')
#define FOURCC_styp GST_MAKE_FOURCC('s','t','y','p')
#define FOURCC_ftab GST_MAKE_FOURCC('f','t','a','b') #define FOURCC_ftab GST_MAKE_FOURCC('f','t','a','b')
#define FOURCC_gama GST_MAKE_FOURCC('g','a','m','a') #define FOURCC_gama GST_MAKE_FOURCC('g','a','m','a')
#define FOURCC_glbl GST_MAKE_FOURCC('g','l','b','l') #define FOURCC_glbl GST_MAKE_FOURCC('g','l','b','l')

58
subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
View file

@ -2672,14 +2672,56 @@ qtdemux_parse_ftyp (GstQTDemux * qtdemux, const guint8 * buffer, gint length)
/* only consider at least a sufficiently complete ftyp atom */ /* only consider at least a sufficiently complete ftyp atom */
if (length >= 20) { if (length >= 20) {
GstBuffer *buf; GstBuffer *buf;
guint32 minor_version;
const guint8 *p;
qtdemux->major_brand = QT_FOURCC (buffer + 8); qtdemux->major_brand = QT_FOURCC (buffer + 8);
GST_DEBUG_OBJECT (qtdemux, "major brand: %" GST_FOURCC_FORMAT, GST_DEBUG_OBJECT (qtdemux, "ftyp major brand: %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (qtdemux->major_brand)); GST_FOURCC_ARGS (qtdemux->major_brand));
minor_version = QT_UINT32 (buffer + 12);
GST_DEBUG_OBJECT (qtdemux, "ftyp minor version: %u", minor_version);
if (qtdemux->comp_brands) if (qtdemux->comp_brands)
gst_buffer_unref (qtdemux->comp_brands); gst_buffer_unref (qtdemux->comp_brands);
buf = qtdemux->comp_brands = gst_buffer_new_and_alloc (length - 16); buf = qtdemux->comp_brands = gst_buffer_new_and_alloc (length - 16);
gst_buffer_fill (buf, 0, buffer + 16, length - 16); gst_buffer_fill (buf, 0, buffer + 16, length - 16);
p = buffer + 16;
length = length - 16;
while (length > 0) {
GST_DEBUG_OBJECT (qtdemux, "ftyp compatible brand: %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (QT_FOURCC (p)));
length -= 4;
p += 4;
}
}
}
static void
qtdemux_parse_styp (GstQTDemux * qtdemux, const guint8 * buffer, gint length)
{
/* only consider at least a sufficiently complete styp atom */
if (length >= 20) {
GstBuffer *buf;
guint32 major_brand;
guint32 minor_version;
const guint8 *p;
major_brand = QT_FOURCC (buffer + 8);
GST_DEBUG_OBJECT (qtdemux, "styp major brand: %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (major_brand));
minor_version = QT_UINT32 (buffer + 12);
GST_DEBUG_OBJECT (qtdemux, "styp minor version: %u", minor_version);
buf = qtdemux->comp_brands = gst_buffer_new_and_alloc (length - 16);
gst_buffer_fill (buf, 0, buffer + 16, length - 16);
p = buffer + 16;
length = length - 16;
while (length > 0) {
GST_DEBUG_OBJECT (qtdemux, "styp compatible brand: %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (QT_FOURCC (p)));
length -= 4;
p += 4;
}
} }
} }
@ -4605,6 +4647,20 @@ gst_qtdemux_loop_state_header (GstQTDemux * qtdemux)
gst_buffer_unref (ftyp); gst_buffer_unref (ftyp);
break; break;
} }
case FOURCC_styp:
{
GstBuffer *styp = NULL;
ret = gst_qtdemux_pull_atom (qtdemux, cur_offset, length, &styp);
if (ret != GST_FLOW_OK)
goto beach;
qtdemux->offset += length;
gst_buffer_map (styp, &map, GST_MAP_READ);
qtdemux_parse_styp (qtdemux, map.data, map.size);
gst_buffer_unmap (styp, &map);
gst_buffer_unref (styp);
break;
}
case FOURCC_uuid: case FOURCC_uuid:
{ {
GstBuffer *uuid = NULL; GstBuffer *uuid = NULL;