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

qtdemux: add qt_atom_parser_has_chunks() and fix indentation

Browse source
This commit is contained in:
Tim-Philipp Müller 2009-08-25 12:11:28 +01:00
parent f65e6ea3a1
commit 0f197776e1
3 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/qtdemux/qtatomparser.h
View file

@ -45,6 +45,15 @@ qt_atom_parser_has_remaining (QtAtomParser * parser, guint64 min_remaining)
G_LIKELY ((parser->size - min_remaining) >= parser->byte); G_LIKELY ((parser->size - min_remaining) >= parser->byte);
} }
static inline gboolean
qt_atom_parser_has_chunks (QtAtomParser * parser, guint32 n_chunks,
guint32 chunk_size)
{
/* assumption: n_chunks and chunk_size are 32-bit, we cast to 64-bit here
* to avoid overflows, to handle e.g. (guint32)-1 * size correctly */
return qt_atom_parser_has_remaining (parser, (guint64) n_chunks * chunk_size);
}
static inline gboolean static inline gboolean
qt_atom_parser_skip (QtAtomParser * parser, guint nbytes) qt_atom_parser_skip (QtAtomParser * parser, guint nbytes)
{ {

20
gst/qtdemux/qtdemux.c
View file

@ -3256,7 +3256,8 @@ broken_atom_size:
GST_ELEMENT_ERROR (qtdemux, STREAM, DEMUX, GST_ELEMENT_ERROR (qtdemux, STREAM, DEMUX,
(_("This file is corrupt and cannot be played.")), (_("This file is corrupt and cannot be played.")),
("Atom '%" GST_FOURCC_FORMAT "' has size of %u bytes, but we have only " ("Atom '%" GST_FOURCC_FORMAT "' has size of %u bytes, but we have only "
"%u bytes available.", GST_FOURCC_ARGS (fourcc), node_length, length)); "%u bytes available.", GST_FOURCC_ARGS (fourcc), node_length,
length));
return FALSE; return FALSE;
} }
} }
@ -3589,7 +3590,7 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream,
/* set the sample sizes */ /* set the sample sizes */
if (sample_size == 0) { if (sample_size == 0) {
/* different sizes for each sample */ /* different sizes for each sample */
if (!qt_atom_parser_has_remaining (&stsz, 4 * n_samples)) if (!qt_atom_parser_has_chunks (&stsz, n_samples, 4))
goto corrupt_file; goto corrupt_file;
for (i = 0; i < n_samples; i++) { for (i = 0; i < n_samples; i++) {
@ -3608,7 +3609,7 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream,
!qt_atom_parser_get_uint32 (&stsc, &n_samples_per_chunk)) !qt_atom_parser_get_uint32 (&stsc, &n_samples_per_chunk))
goto corrupt_file; goto corrupt_file;
if (!qt_atom_parser_has_remaining (&stsc, 12 * n_samples_per_chunk)) if (!qt_atom_parser_has_chunks (&stsc, n_samples_per_chunk, 12))
goto corrupt_file; goto corrupt_file;
index = 0; index = 0;
@ -3681,7 +3682,7 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream,
GST_LOG_OBJECT (qtdemux, "%u timestamp blocks", n_sample_times); GST_LOG_OBJECT (qtdemux, "%u timestamp blocks", n_sample_times);
/* make sure there's enough data */ /* make sure there's enough data */
if (!qt_atom_parser_has_remaining (&stts, n_sample_times * (2 * 4))) if (!qt_atom_parser_has_chunks (&stts, n_sample_times, 2 * 4))
goto corrupt_file; goto corrupt_file;
timestamp = 0; timestamp = 0;
@ -3723,8 +3724,9 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream,
* We however look at the last timestamp to estimate the track length so we * We however look at the last timestamp to estimate the track length so we
* need something in here. */ * need something in here. */
for (; index < n_samples; index++) { for (; index < n_samples; index++) {
GST_DEBUG_OBJECT (qtdemux, "fill sample %d: timestamp %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (qtdemux,
index, GST_TIME_ARGS (timestamp)); "fill sample %d: timestamp %" GST_TIME_FORMAT, index,
GST_TIME_ARGS (timestamp));
samples[index].timestamp = timestamp; samples[index].timestamp = timestamp;
samples[index].duration = -1; samples[index].duration = -1;
} }
@ -3748,7 +3750,7 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream,
stream->all_keyframe = TRUE; stream->all_keyframe = TRUE;
} else { } else {
/* make sure there's enough data */ /* make sure there's enough data */
if (!qt_atom_parser_has_remaining (&stss, n_sample_syncs * 4)) if (!qt_atom_parser_has_chunks (&stss, n_sample_syncs, 4))
goto corrupt_file; goto corrupt_file;
for (i = 0; i < n_sample_syncs; i++) { for (i = 0; i < n_sample_syncs; i++) {
/* note that the first sample is index 1, not 0 */ /* note that the first sample is index 1, not 0 */
@ -3771,7 +3773,7 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream,
* samples */ * samples */
} else { } else {
/* make sure there's enough data */ /* make sure there's enough data */
if (!qt_atom_parser_has_remaining (&stps, n_sample_syncs * 4)) if (!qt_atom_parser_has_chunks (&stps, n_sample_syncs, 4))
goto corrupt_file; goto corrupt_file;
for (i = 0; i < n_sample_syncs; i++) { for (i = 0; i < n_sample_syncs; i++) {
/* note that the first sample is index 1, not 0 */ /* note that the first sample is index 1, not 0 */
@ -3822,7 +3824,7 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream,
sample_index = 0; sample_index = 0;
timestamp = 0; timestamp = 0;
if (!qt_atom_parser_has_remaining (&stsc, 12 * n_samples_per_chunk)) if (!qt_atom_parser_has_chunks (&stsc, n_samples_per_chunk, 12))
goto corrupt_file; goto corrupt_file;
for (i = 0; i < n_samples_per_chunk; i++) { for (i = 0; i < n_samples_per_chunk; i++) {

22
gst/qtdemux/qtdemux_dump.c
View file

@ -112,7 +112,7 @@ qtdemux_dump_elst (GstQTDemux * qtdemux, QtAtomParser * data, int depth)
GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags); GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags);
GST_LOG ("%*s n entries: %d", depth, "", num_entries); GST_LOG ("%*s n entries: %d", depth, "", num_entries);
if (!qt_atom_parser_has_remaining (data, num_entries * (4 + 4 + 4))) if (!qt_atom_parser_has_chunks (data, num_entries, 4 + 4 + 4))
return FALSE; return FALSE;
for (i = 0; i < num_entries; i++) { for (i = 0; i < num_entries; i++) {
@ -301,12 +301,12 @@ qtdemux_dump_stts (GstQTDemux * qtdemux, QtAtomParser * data, int depth)
GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags); GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags);
GST_LOG ("%*s n entries: %d", depth, "", num_entries); GST_LOG ("%*s n entries: %d", depth, "", num_entries);
if (!qt_atom_parser_has_remaining (data, num_entries * (4 + 4))) if (!qt_atom_parser_has_chunks (data, num_entries, 4 + 4))
return FALSE; return FALSE;
for (i = 0; i < num_entries; i++) { for (i = 0; i < num_entries; i++) {
GST_LOG ("%*s count: %u", depth, "", GET_UINT32 (data)); GST_LOG ("%*s count: %u", depth, "", GET_UINT32 (data));
GST_LOG ("%*s duration: %u", depth, "",GET_UINT32 (data)); GST_LOG ("%*s duration: %u", depth, "", GET_UINT32 (data));
} }
return TRUE; return TRUE;
} }
@ -323,7 +323,7 @@ qtdemux_dump_stps (GstQTDemux * qtdemux, QtAtomParser * data, int depth)
GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags); GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags);
GST_LOG ("%*s n entries: %d", depth, "", num_entries); GST_LOG ("%*s n entries: %d", depth, "", num_entries);
if (!qt_atom_parser_has_remaining (data, num_entries * 4)) if (!qt_atom_parser_has_chunks (data, num_entries, 4))
return FALSE; return FALSE;
for (i = 0; i < num_entries; i++) { for (i = 0; i < num_entries; i++) {
@ -344,7 +344,7 @@ qtdemux_dump_stss (GstQTDemux * qtdemux, QtAtomParser * data, int depth)
GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags); GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags);
GST_LOG ("%*s n entries: %d", depth, "", num_entries); GST_LOG ("%*s n entries: %d", depth, "", num_entries);
if (!qt_atom_parser_has_remaining (data, num_entries * 4)) if (!qt_atom_parser_has_chunks (data, num_entries, 4))
return FALSE; return FALSE;
for (i = 0; i < num_entries; i++) { for (i = 0; i < num_entries; i++) {
@ -365,7 +365,7 @@ qtdemux_dump_stsc (GstQTDemux * qtdemux, QtAtomParser * data, int depth)
GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags); GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags);
GST_LOG ("%*s n entries: %d", depth, "", num_entries); GST_LOG ("%*s n entries: %d", depth, "", num_entries);
if (!qt_atom_parser_has_remaining (data, num_entries * (4 + 4 + 4))) if (!qt_atom_parser_has_chunks (data, num_entries, 4 + 4 + 4))
return FALSE; return FALSE;
for (i = 0; i < num_entries; i++) { for (i = 0; i < num_entries; i++) {
@ -394,7 +394,7 @@ qtdemux_dump_stsz (GstQTDemux * qtdemux, QtAtomParser * data, int depth)
GST_LOG ("%*s n entries: %d", depth, "", num_entries); GST_LOG ("%*s n entries: %d", depth, "", num_entries);
#if 0 #if 0
if (!qt_atom_parser_has_remaining (data, num_entries * 4))) if (!qt_atom_parser_has_chunks (data, num_entries, 4))
return FALSE; return FALSE;
for (i = 0; i < num_entries; i++) { for (i = 0; i < num_entries; i++) {
GST_LOG ("%*s sample size: %u", depth, "", GET_UINT32 (data)); GST_LOG ("%*s sample size: %u", depth, "", GET_UINT32 (data));
@ -416,7 +416,7 @@ qtdemux_dump_stco (GstQTDemux * qtdemux, QtAtomParser * data, int depth)
GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags); GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags);
GST_LOG ("%*s n entries: %d", depth, "", num_entries); GST_LOG ("%*s n entries: %d", depth, "", num_entries);
if (!qt_atom_parser_has_remaining (data, num_entries * 4)) if (!qt_atom_parser_has_chunks (data, num_entries, 4))
return FALSE; return FALSE;
for (i = 0; i < num_entries; i++) { for (i = 0; i < num_entries; i++) {
@ -437,7 +437,7 @@ qtdemux_dump_ctts (GstQTDemux * qtdemux, QtAtomParser * data, int depth)
GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags); GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags);
GST_LOG ("%*s n entries: %d", depth, "", num_entries); GST_LOG ("%*s n entries: %d", depth, "", num_entries);
if (!qt_atom_parser_has_remaining (data, num_entries * (4 + 4))) if (!qt_atom_parser_has_chunks (data, num_entries, 4 + 4))
return FALSE; return FALSE;
for (i = 0; i < num_entries; i++) { for (i = 0; i < num_entries; i++) {
@ -460,7 +460,7 @@ qtdemux_dump_co64 (GstQTDemux * qtdemux, QtAtomParser * data, int depth)
GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags); GST_LOG ("%*s version/flags: %08x", depth, "", ver_flags);
GST_LOG ("%*s n entries: %d", depth, "", num_entries); GST_LOG ("%*s n entries: %d", depth, "", num_entries);
if (!qt_atom_parser_has_remaining (data, num_entries * 8)) if (!qt_atom_parser_has_chunks (data, num_entries, 8))
return FALSE; return FALSE;
for (i = 0; i < num_entries; i++) { for (i = 0; i < num_entries; i++) {
@ -508,7 +508,7 @@ static gboolean
qtdemux_node_dump_foreach (GNode * node, gpointer qtdemux) qtdemux_node_dump_foreach (GNode * node, gpointer qtdemux)
{ {
QtAtomParser parser; QtAtomParser parser;
guint8 *buffer = (guint8 *) node->data; // FIXME: move to byte reader guint8 *buffer = (guint8 *) node->data; /* FIXME: move to byte reader */
guint32 node_length; guint32 node_length;
guint32 fourcc; guint32 fourcc;
const QtNodeType *type; const QtNodeType *type;