mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 15:56:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Ease debugging by removing a goto for an error message

Browse source
This commit is contained in:
Robert Swain 2009-11-10 10:26:07 +01:00
parent 4025d7cbd7
commit f9745e89d3
1 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
gst/qtdemux/qtdemux.c
View file

@ -4055,7 +4055,9 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, guint32 n)
GST_LOG_OBJECT (qtdemux, GST_LOG_OBJECT (qtdemux,
"Tried to parse up to sample %u but there are only %u samples", n + 1, "Tried to parse up to sample %u but there are only %u samples", n + 1,
stream->n_samples); stream->n_samples);
goto corrupt_file; GST_ELEMENT_ERROR (qtdemux, STREAM, DECODE,
(_("This file is corrupt and cannot be played.")), (NULL));
return FALSE;
} }
if (n <= stream->stbl_index) { if (n <= stream->stbl_index) {
@ -4095,9 +4097,11 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, guint32 n)
gst_byte_reader_skip_unchecked (&stream->stsc, 4); gst_byte_reader_skip_unchecked (&stream->stsc, 4);
/* chunk numbers are counted from 1 it seems */ /* chunk numbers are counted from 1 it seems */
if (G_UNLIKELY (stream->first_chunk == 0)) if (G_UNLIKELY (stream->first_chunk == 0)) {
goto corrupt_file; GST_ELEMENT_ERROR (qtdemux, STREAM, DECODE,
else (_("This file is corrupt and cannot be played.")), (NULL));
return FALSE;
} else
--stream->first_chunk; --stream->first_chunk;
/* the last chunk of each entry is calculated by taking the first chunk /* the last chunk of each entry is calculated by taking the first chunk
@ -4108,9 +4112,11 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, guint32 n)
} else { } else {
stream->last_chunk = stream->last_chunk =
gst_byte_reader_peek_uint32_be_unchecked (&stream->stsc); gst_byte_reader_peek_uint32_be_unchecked (&stream->stsc);
if (G_UNLIKELY (stream->last_chunk == 0)) if (G_UNLIKELY (stream->last_chunk == 0)) {
goto corrupt_file; GST_ELEMENT_ERROR (qtdemux, STREAM, DECODE,
else (_("This file is corrupt and cannot be played.")), (NULL));
return FALSE;
} else
--stream->last_chunk; --stream->last_chunk;
} }
@ -4118,20 +4124,29 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, guint32 n)
"entry %d has first_chunk %d, last_chunk %d, samples_per_chunk %d", i, "entry %d has first_chunk %d, last_chunk %d, samples_per_chunk %d", i,
stream->first_chunk, stream->last_chunk, stream->samples_per_chunk); stream->first_chunk, stream->last_chunk, stream->samples_per_chunk);
if (G_UNLIKELY (stream->last_chunk < stream->first_chunk)) if (G_UNLIKELY (stream->last_chunk < stream->first_chunk)) {
goto corrupt_file; GST_ELEMENT_ERROR (qtdemux, STREAM, DECODE,
(_("This file is corrupt and cannot be played.")), (NULL));
return FALSE;
}
if (stream->last_chunk != G_MAXUINT32) { if (stream->last_chunk != G_MAXUINT32) {
if (!qt_atom_parser_peek_sub (&stream->stco, if (!qt_atom_parser_peek_sub (&stream->stco,
stream->first_chunk * stream->co_size, stream->first_chunk * stream->co_size,
(stream->last_chunk - stream->first_chunk) * stream->co_size, (stream->last_chunk - stream->first_chunk) * stream->co_size,
&stream->co_chunk)) &stream->co_chunk)) {
goto corrupt_file; GST_ELEMENT_ERROR (qtdemux, STREAM, DECODE,
(_("This file is corrupt and cannot be played.")), (NULL));
return FALSE;
}
} else { } else {
stream->co_chunk = stream->stco; stream->co_chunk = stream->stco;
if (!gst_byte_reader_skip (&stream->co_chunk, if (!gst_byte_reader_skip (&stream->co_chunk,
stream->first_chunk * stream->co_size)) stream->first_chunk * stream->co_size)) {
goto corrupt_file; GST_ELEMENT_ERROR (qtdemux, STREAM, DECODE,
(_("This file is corrupt and cannot be played.")), (NULL));
return FALSE;
}
} }
stream->stsc_chunk_index = stream->first_chunk; stream->stsc_chunk_index = stream->first_chunk;
@ -4141,8 +4156,11 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, guint32 n)
for (j = stream->stsc_chunk_index; j < stream->last_chunk; j++) { for (j = stream->stsc_chunk_index; j < stream->last_chunk; j++) {
if (!stream->stsc_sample_index if (!stream->stsc_sample_index
&& !qt_atom_parser_get_offset (&stream->co_chunk, stream->co_size, && !qt_atom_parser_get_offset (&stream->co_chunk, stream->co_size,
&stream->chunk_offset)) &stream->chunk_offset)) {
goto corrupt_file; GST_ELEMENT_ERROR (qtdemux, STREAM, DECODE,
(_("This file is corrupt and cannot be played.")), (NULL));
return FALSE;
}
for (k = stream->stsc_sample_index; k < stream->samples_per_chunk; k++) { for (k = stream->stsc_sample_index; k < stream->samples_per_chunk; k++) {
GST_LOG_OBJECT (qtdemux, "Creating entry %d with offset %" GST_LOG_OBJECT (qtdemux, "Creating entry %d with offset %"
@ -4324,14 +4342,6 @@ done:
stream->stbl_index = n; stream->stbl_index = n;
return TRUE; return TRUE;
/* ERRORS */
corrupt_file:
{
GST_ELEMENT_ERROR (qtdemux, STREAM, DECODE,
(_("This file is corrupt and cannot be played.")), (NULL));
return FALSE;
}
} }
/* collect all segment info for @stream. /* collect all segment info for @stream.