mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: make qtdemux_dump_mvhd parse version 1 correctly

Browse source 
Versions 0 and 1 of mvhd have different sizes of its values
(32bits/64bits). This patch makes it dump them correctly.

Also use the right node in the parameter and not the root node.

https://bugzilla.gnome.org/show_bug.cgi?id=596321
This commit is contained in:
Marc-André Lureau 2010-07-14 20:13:55 +02:00 committed by Mark Nauwelaerts
parent b9048fd953
commit 994313da50
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gst/qtdemux/qtdemux_dump.c
View file

@ -37,14 +37,31 @@
gboolean gboolean
qtdemux_dump_mvhd (GstQTDemux * qtdemux, GstByteReader * data, int depth) qtdemux_dump_mvhd (GstQTDemux * qtdemux, GstByteReader * data, int depth)
{ {
guint32 version = 0;
if (!qt_atom_parser_has_remaining (data, 100)) if (!qt_atom_parser_has_remaining (data, 100))
return FALSE; return FALSE;
GST_LOG ("%*s version/flags: %08x", depth, "", GET_UINT32 (data)); version = GET_UINT32 (data);
GST_LOG ("%*s creation time: %u", depth, "", GET_UINT32 (data)); GST_LOG ("%*s version/flags: %08x", depth, "", version);
GST_LOG ("%*s modify time: %u", depth, "", GET_UINT32 (data));
GST_LOG ("%*s time scale: 1/%u sec", depth, "", GET_UINT32 (data)); version = version >> 24;
GST_LOG ("%*s duration: %u", depth, "", GET_UINT32 (data)); if (version == 0) {
GST_LOG ("%*s creation time: %u", depth, "", GET_UINT32 (data));
GST_LOG ("%*s modify time: %u", depth, "", GET_UINT32 (data));
GST_LOG ("%*s time scale: 1/%u sec", depth, "", GET_UINT32 (data));
GST_LOG ("%*s duration: %u", depth, "", GET_UINT32 (data));
} else if (version == 1) {
GST_LOG ("%*s creation time: %" G_GUINT64_FORMAT,
depth, "", GET_UINT64 (data));
GST_LOG ("%*s modify time: %" G_GUINT64_FORMAT,
depth, "", GET_UINT64 (data));
GST_LOG ("%*s time scale: 1/%u sec", depth, "", GET_UINT32 (data));
GST_LOG ("%*s duration: %" G_GUINT64_FORMAT,
depth, "", GET_UINT64 (data));
} else
return FALSE;
GST_LOG ("%*s pref. rate: %g", depth, "", GET_FP32 (data)); GST_LOG ("%*s pref. rate: %g", depth, "", GET_FP32 (data));
GST_LOG ("%*s pref. volume: %g", depth, "", GET_FP16 (data)); GST_LOG ("%*s pref. volume: %g", depth, "", GET_FP16 (data));
gst_byte_reader_skip (data, 46); gst_byte_reader_skip (data, 46);
@ -548,7 +565,7 @@ qtdemux_node_dump (GstQTDemux * qtdemux, GNode * node)
if (__gst_debug_min < GST_LEVEL_LOG) if (__gst_debug_min < GST_LEVEL_LOG)
return TRUE; return TRUE;
g_node_traverse (qtdemux->moov_node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, g_node_traverse (node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
qtdemux_node_dump_foreach, qtdemux); qtdemux_node_dump_foreach, qtdemux);
return TRUE; return TRUE;
} }