FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtdemux: Handle stsd entry offset correctly for audio in qtdemux_parse_node()

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8929>
This commit is contained in:
Sebastian Dröge 2025-05-04 19:54:41 +03:00 committed by GStreamer Marge Bot
parent ae4d505fe0
commit f575fe763c
1 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
View File

@ -9077,6 +9077,7 @@ qtdemux_parse_node (GstQTDemux * qtdemux, GNode * node, const guint8 * buffer,
case FOURCC_aavd: case FOURCC_aavd:
case FOURCC_opus: case FOURCC_opus:
{ {
guint8 stsd_version;
guint32 version; guint32 version;
guint32 offset; guint32 offset;
guint min_size; guint min_size;
@ -9105,30 +9106,57 @@ qtdemux_parse_node (GstQTDemux * qtdemux, GNode * node, const guint8 * buffer,
/* 'version' here is the sound sample description version. Types 0 and /* 'version' here is the sound sample description version. Types 0 and
1 are documented in the QTFF reference, but type 2 is not: it's 1 are documented in the QTFF reference, but type 2 is not: it's
described in Apple header files instead (struct SoundDescriptionV2 described in Apple header files instead (struct SoundDescriptionV2
in Movies.h) */ in Movies.h).
For ISOBMFF there's only version 0 and 1, and both have the same size.
The distinction between the two version 1 can be made via the stsd (parent)
node version.
*/
stsd_version = QT_UINT8 ((const guint8 *) node->data + 8);
version = QT_UINT16 (buffer + 16); version = QT_UINT16 (buffer + 16);
GST_DEBUG_OBJECT (qtdemux, "%" GST_FOURCC_FORMAT " version 0x%08x", GST_DEBUG_OBJECT (qtdemux,
GST_FOURCC_ARGS (fourcc), version); "%" GST_FOURCC_FORMAT " stsd version %u version %u",
GST_FOURCC_ARGS (fourcc), stsd_version, version);
/* parse any esds descriptors */ if (stsd_version == 0) {
switch (version) { /* parse any esds descriptors and other optional boxes */
case 0: switch (version) {
offset = 0x24; case 0:
break; offset = 36;
case 1: break;
offset = 0x34; case 1:
break; offset = 52;
case 2: break;
offset = 0x48; case 2:
break; offset = 72;
default: break;
GST_WARNING_OBJECT (qtdemux, default:
"unhandled %" GST_FOURCC_FORMAT " version 0x%08x", GST_WARNING_OBJECT (qtdemux,
GST_FOURCC_ARGS (fourcc), version); "unhandled %" GST_FOURCC_FORMAT " version %u",
offset = 0; GST_FOURCC_ARGS (fourcc), version);
break; offset = 0;
break;
}
} else if (stsd_version == 1) {
switch (version) {
case 0:
case 1:
offset = 36;
break;
default:
GST_WARNING_OBJECT (qtdemux,
"unhandled %" GST_FOURCC_FORMAT " version %u",
GST_FOURCC_ARGS (fourcc), version);
offset = 0;
break;
}
} else {
GST_WARNING_OBJECT (qtdemux,
"unhandled stsd version %u", stsd_version);
offset = 0;
} }
if (offset) if (offset)
qtdemux_parse_container (qtdemux, node, buffer + offset, end); qtdemux_parse_container (qtdemux, node, buffer + offset, end);
break; break;