}
}
+ /* sample size */
+ if (!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stsz, &stream->stsz))
+ goto no_samples;
+
+ /* copy atom data into a new buffer for later use */
+ stream->stsz.data = g_memdup (stream->stsz.data, stream->stsz.size);
+
+ /* skip version + flags */
+ if (!gst_byte_reader_skip (&stream->stsz, 1 + 3) ||
+ !gst_byte_reader_get_uint32_be (&stream->stsz, &stream->sample_size))
+ goto corrupt_file;
+
+ if (!gst_byte_reader_get_uint32_be (&stream->stsz, &stream->n_samples))
+ goto corrupt_file;
+
+ if (!stream->n_samples)
+ goto no_samples;
/* sample-to-chunk atom */
if (!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stsc, &stream->stsc))
goto corrupt_file;
- /* sample size */
- if (!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stsz, &stream->stsz))
- goto corrupt_file;
-
- /* copy atom data into a new buffer for later use */
- stream->stsz.data = g_memdup (stream->stsz.data, stream->stsz.size);
-
- /* skip version + flags */
- if (!gst_byte_reader_skip (&stream->stsz, 1 + 3) ||
- !gst_byte_reader_get_uint32_be (&stream->stsz, &stream->sample_size))
- goto corrupt_file;
-
-
/* chunk offset */
if (qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stco, &stream->stco))
stream->co_size = sizeof (guint32);
if (!gst_byte_reader_skip (&stream->stco, 4))
goto corrupt_file;
- if (!gst_byte_reader_get_uint32_be (&stream->stsz, &stream->n_samples))
- goto corrupt_file;
-
/* make sure there are enough data in the stsz atom */
if (!stream->sample_size) {
/* different sizes for each sample */
goto corrupt_file;
}
- if (!stream->n_samples) {
- gst_qtdemux_stbl_free (stream);
- if (!qtdemux->fragmented) {
- /* not quite good */
- GST_WARNING_OBJECT (qtdemux, "stream has no samples");
- return FALSE;
- } else {
- /* may pick up samples elsewhere */
- return TRUE;
- }
- }
-
GST_DEBUG_OBJECT (qtdemux,
"allocating n_samples %u * %" G_GSIZE_FORMAT " = (%u MB)",
stream->n_samples, sizeof (QtDemuxSample),
(_("This file is corrupt and cannot be played.")), (NULL));
return FALSE;
}
+no_samples:
+ {
+ gst_qtdemux_stbl_free (stream);
+ if (!qtdemux->fragmented) {
+ /* not quite good */
+ GST_WARNING_OBJECT (qtdemux, "stream has no samples");
+ return FALSE;
+ } else {
+ /* may pick up samples elsewhere */
+ return TRUE;
+ }
+ }
}
/* collect samples from the next sample to be parsed up to sample @n for @stream