Commit 21212153 authored by Wim Taymans's avatar Wim Taymans

gst/qtdemux/qtdemux.c: Don't crash on files with 0 samples, EOS immediatly instead.

Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_state_header),
(gst_qtdemux_prepare_current_sample), (gst_qtdemux_advance_sample),
(gst_qtdemux_add_stream):
Don't crash on files with 0 samples, EOS immediatly instead.
Fixes #344944.
parent 34f03fe5
2006-06-15 Wim Taymans <wim@fluendo.com>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_state_header),
(gst_qtdemux_prepare_current_sample), (gst_qtdemux_advance_sample),
(gst_qtdemux_add_stream):
Don't crash on files with 0 samples, EOS immediatly instead.
Fixes #344944.
2006-06-14 Tim-Philipp Müller <tim at centricular dot net> 2006-06-14 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Wouter Paesen <wouter at kangaroot net> Patch by: Wouter Paesen <wouter at kangaroot net>
......
...@@ -1016,8 +1016,8 @@ gst_qtdemux_loop_state_header (GstQTDemux * qtdemux) ...@@ -1016,8 +1016,8 @@ gst_qtdemux_loop_state_header (GstQTDemux * qtdemux)
qtdemux->state = QTDEMUX_STATE_MOVIE; qtdemux->state = QTDEMUX_STATE_MOVIE;
GST_DEBUG_OBJECT (qtdemux, "switching state to STATE_MOVIE (%d)", GST_DEBUG_OBJECT (qtdemux, "switching state to STATE_MOVIE (%d)",
qtdemux->state); qtdemux->state);
}
break; break;
}
ed_edd_and_eddy: ed_edd_and_eddy:
default:{ default:{
GST_LOG ("unknown %08x '%" GST_FOURCC_FORMAT "' at %d", GST_LOG ("unknown %08x '%" GST_FOURCC_FORMAT "' at %d",
...@@ -1150,6 +1150,9 @@ gst_qtdemux_prepare_current_sample (GstQTDemux * qtdemux, ...@@ -1150,6 +1150,9 @@ gst_qtdemux_prepare_current_sample (GstQTDemux * qtdemux,
if (stream->segment_index != seg_idx) if (stream->segment_index != seg_idx)
gst_qtdemux_activate_segment (qtdemux, stream, seg_idx, time_position); gst_qtdemux_activate_segment (qtdemux, stream, seg_idx, time_position);
if (stream->sample_index >= stream->n_samples)
goto eos;
/* now get the info for the sample we're at */ /* now get the info for the sample we're at */
sample = &stream->samples[stream->sample_index]; sample = &stream->samples[stream->sample_index];
...@@ -1186,7 +1189,7 @@ gst_qtdemux_advance_sample (GstQTDemux * qtdemux, QtDemuxStream * stream) ...@@ -1186,7 +1189,7 @@ gst_qtdemux_advance_sample (GstQTDemux * qtdemux, QtDemuxStream * stream)
segment = &stream->segments[stream->segment_index]; segment = &stream->segments[stream->segment_index];
/* reached the last sample, we need the next segment */ /* reached the last sample, we need the next segment */
if (stream->sample_index == stream->n_samples) if (stream->sample_index >= stream->n_samples)
goto next_segment; goto next_segment;
/* get next sample */ /* get next sample */
...@@ -1410,12 +1413,11 @@ invalid_state: ...@@ -1410,12 +1413,11 @@ invalid_state:
} }
/* /*
next_entry_size * next_entry_size
*
Returns the size of the first entry at the current offset. * Returns the size of the first entry at the current offset.
If -1, there are none (which means EOS or empty file). * If -1, there are none (which means EOS or empty file).
*/ */
static guint64 static guint64
next_entry_size (GstQTDemux * demux) next_entry_size (GstQTDemux * demux)
{ {
...@@ -1753,6 +1755,7 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux, ...@@ -1753,6 +1755,7 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux,
/* fps is calculated base on the duration of the first frames since /* fps is calculated base on the duration of the first frames since
* qt does not have a fixed framerate. */ * qt does not have a fixed framerate. */
if ((stream->n_samples == 1) && (stream->min_duration == 0)) { if ((stream->n_samples == 1) && (stream->min_duration == 0)) {
/* still frame */
stream->fps_n = 0; stream->fps_n = 0;
stream->fps_d = 1; stream->fps_d = 1;
} else { } else {
...@@ -1768,6 +1771,7 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux, ...@@ -1768,6 +1771,7 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux,
"width", G_TYPE_INT, stream->width, "width", G_TYPE_INT, stream->width,
"height", G_TYPE_INT, stream->height, "height", G_TYPE_INT, stream->height,
"framerate", GST_TYPE_FRACTION, stream->fps_n, stream->fps_d, NULL); "framerate", GST_TYPE_FRACTION, stream->fps_n, stream->fps_d, NULL);
if ((stream->bits_per_sample & 0x1F) == 8) { if ((stream->bits_per_sample & 0x1F) == 8) {
const guint32 *palette_data = NULL; const guint32 *palette_data = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment