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

qtdemux: Use already parsed stsd entries instead of parsing them again

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

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

@ -6181,7 +6181,7 @@ gst_qtdemux_align_buffer (GstQTDemux * demux,
return buffer; return buffer;
} }
/* Adds padding to the end of each row to achieve byte-alignment /* Adds padding to the end of each row to achieve byte-alignment
* *
* Returns NULL if failed * Returns NULL if failed
*/ */
@ -12024,7 +12024,7 @@ typedef struct UncompressedFrameConfigBox
guint32 component_count; // Should match the cmpd component_count guint32 component_count; // Should match the cmpd component_count
UncompressedFrameConfigComponent *components; // Array of Components UncompressedFrameConfigComponent *components; // Array of Components
guint8 sampling_type; // 0=4:4:4, 1=4:2:2, 2=4:2:0, 3=4:1:1 guint8 sampling_type; // 0=4:4:4, 1=4:2:2, 2=4:2:0, 3=4:1:1
guint8 interleave_type; // Planar, interleaved, etc. guint8 interleave_type; // Planar, interleaved, etc.
guint8 block_size; // Stores data in fixed-sized blocks guint8 block_size; // Stores data in fixed-sized blocks
gboolean components_little_endian; // indicates that components are stored as little endian gboolean components_little_endian; // indicates that components are stored as little endian
gboolean block_pad_lsb; // Padding bits location gboolean block_pad_lsb; // Padding bits location
@ -14508,8 +14508,6 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak, guint32 * mvhd_matrix)
QtDemuxStream *stream = NULL; QtDemuxStream *stream = NULL;
const guint8 *stsd_data; const guint8 *stsd_data;
const guint8 *stsd_entry_data;
guint remaining_stsd_len;
guint stsd_entry_count; guint stsd_entry_count;
guint stsd_index; guint stsd_index;
guint16 lang_code; /* quicktime lang code or packed iso code */ guint16 lang_code; /* quicktime lang code or packed iso code */
@ -14713,18 +14711,21 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak, guint32 * mvhd_matrix)
GST_LOG_OBJECT (qtdemux, "stsd len: %d", stsd_len); GST_LOG_OBJECT (qtdemux, "stsd len: %d", stsd_len);
GST_LOG_OBJECT (qtdemux, "stsd entry count: %u", stsd_entry_count); GST_LOG_OBJECT (qtdemux, "stsd entry count: %u", stsd_entry_count);
stsd_entry_data = stsd_data + 16;
remaining_stsd_len = stsd_len - 16;
for (stsd_index = 0; stsd_index < stsd_entry_count; stsd_index++) { for (stsd_index = 0; stsd_index < stsd_entry_count; stsd_index++) {
GNode *stsd_entry;
const guint8 *stsd_entry_data;
guint32 fourcc; guint32 fourcc;
gchar *codec = NULL; gchar *codec = NULL;
QtDemuxStreamStsdEntry *entry = &stream->stsd_entries[stsd_index]; QtDemuxStreamStsdEntry *entry = &stream->stsd_entries[stsd_index];
/* and that entry should fit within stsd */ stsd_entry = qtdemux_tree_get_child_by_index (stsd, stsd_index);
len = QT_UINT32 (stsd_entry_data); if (!stsd_entry)
if (len > remaining_stsd_len)
goto corrupt_file; goto corrupt_file;
stsd_entry_data = stsd_entry->data;
len = QT_UINT32 (stsd_entry_data);
entry->fourcc = fourcc = QT_FOURCC (stsd_entry_data + 4); entry->fourcc = fourcc = QT_FOURCC (stsd_entry_data + 4);
GST_LOG_OBJECT (qtdemux, "stsd type: %" GST_FOURCC_FORMAT, GST_LOG_OBJECT (qtdemux, "stsd type: %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (entry->fourcc)); GST_FOURCC_ARGS (entry->fourcc));
@ -17036,10 +17037,6 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak, guint32 * mvhd_matrix)
} else if (entry->fourcc == FOURCC_mp4a) { } else if (entry->fourcc == FOURCC_mp4a) {
entry->sampled = TRUE; entry->sampled = TRUE;
} }
stsd_entry_data += len;
remaining_stsd_len -= len;
} }
/* Sample grouping support */ /* Sample grouping support */