mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Fix debug output during trun parsing

Browse source 
Various integers are unsigned so print them as such. Also print the actual
allocation size if allocation fails, not only parts of it.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8059>
This commit is contained in:
Sebastian Dröge 2024-09-26 18:40:56 +03:00 committed by GStreamer Marge Bot
parent ae61a604c0
commit cbd659c58f
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3370,8 +3370,8 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
gint64 initial_offset; gint64 initial_offset;
gint32 min_ct = 0; gint32 min_ct = 0;
GST_LOG_OBJECT (qtdemux, "parsing trun track-id %d; " GST_LOG_OBJECT (qtdemux, "parsing trun track-id %u; "
"default dur %d, size %d, flags 0x%x, base offset %" G_GINT64_FORMAT ", " "default dur %u, size %u, flags 0x%x, base offset %" G_GINT64_FORMAT ", "
"decode ts %" G_GINT64_FORMAT, stream->track_id, d_sample_duration, "decode ts %" G_GINT64_FORMAT, stream->track_id, d_sample_duration,
d_sample_size, d_sample_flags, *base_offset, decode_ts); d_sample_size, d_sample_flags, *base_offset, decode_ts);
@ -3410,7 +3410,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
"trun offset is less than the moof size, assuming offset is after moof"); "trun offset is less than the moof size, assuming offset is after moof");
data_offset = moof_length + 8; data_offset = moof_length + 8;
} }
GST_LOG_OBJECT (qtdemux, "trun data offset %d", data_offset); GST_LOG_OBJECT (qtdemux, "trun data offset %u", data_offset);
/* default base offset = first byte of moof */ /* default base offset = first byte of moof */
if (*base_offset == -1) { if (*base_offset == -1) {
GST_LOG_OBJECT (qtdemux, "base_offset at moof"); GST_LOG_OBJECT (qtdemux, "base_offset at moof");
@ -3432,7 +3432,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
GST_LOG_OBJECT (qtdemux, "running offset now %" G_GINT64_FORMAT, GST_LOG_OBJECT (qtdemux, "running offset now %" G_GINT64_FORMAT,
*running_offset); *running_offset);
GST_LOG_OBJECT (qtdemux, "trun offset %d, flags 0x%x, entries %d", GST_LOG_OBJECT (qtdemux, "trun offset %u, flags 0x%x, entries %u",
data_offset, flags, samples_count); data_offset, flags, samples_count);
if (flags & TR_FIRST_SAMPLE_FLAGS) { if (flags & TR_FIRST_SAMPLE_FLAGS) {
@ -3641,14 +3641,15 @@ fail:
} }
out_of_memory: out_of_memory:
{ {
GST_WARNING_OBJECT (qtdemux, "failed to allocate %d samples", GST_WARNING_OBJECT (qtdemux, "failed to allocate %u + %u samples",
stream->n_samples); stream->n_samples, samples_count);
return FALSE; return FALSE;
} }
index_too_big: index_too_big:
{ {
GST_WARNING_OBJECT (qtdemux, "not allocating index of %d samples, would " GST_WARNING_OBJECT (qtdemux,
"be larger than %uMB (broken file?)", stream->n_samples, "not allocating index of %u + %u samples, would "
"be larger than %uMB (broken file?)", stream->n_samples, samples_count,
QTDEMUX_MAX_SAMPLE_INDEX_SIZE >> 20); QTDEMUX_MAX_SAMPLE_INDEX_SIZE >> 20);
return FALSE; return FALSE;
} }