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

avidemux: Fix _handle_seek_push () and new segement behaviour

Browse source
This commit is contained in:
Robert Swain 2010-01-19 10:51:08 +01:00
parent 2ce79998a1
commit 0011c9b0da
1 changed files with 59 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
gst/avi/gstavidemux.c
View file

@ -777,13 +777,14 @@ gst_avi_demux_handle_sink_event (GstPad * pad, GstEvent * event)
if (avi->have_index) { if (avi->have_index) {
GstAviIndexEntry *entry; GstAviIndexEntry *entry;
guint index; guint i = 0, index;
/* FIXME, this code assumes the main stream with keyframes is stream 0, GstAviStream *stream;
* which is mostly correct... */
GstAviStream *stream = &avi->stream[avi->main_stream];
/* find the index for start bytes offset, calculate the corresponding /* find which stream we're on */
* time and (reget?) start offset in bytes */ do {
stream = &avi->stream[i];
/* find the index for start bytes offset */
entry = gst_util_array_binary_search (stream->index, entry = gst_util_array_binary_search (stream->index,
stream->idx_n, sizeof (GstAviIndexEntry), stream->idx_n, sizeof (GstAviIndexEntry),
(GCompareDataFunc) gst_avi_demux_index_entry_offset_search, (GCompareDataFunc) gst_avi_demux_index_entry_offset_search,
@ -795,7 +796,11 @@ gst_avi_demux_handle_sink_event (GstPad * pad, GstEvent * event)
index = entry - stream->index; index = entry - stream->index;
} }
start = stream->index[index].offset; if (stream->index[index].offset == start)
break;
} while (++i < avi->num_streams);
/* get the ts corresponding to start offset bytes for the stream */
gst_avi_demux_get_buffer_info (avi, stream, index, gst_avi_demux_get_buffer_info (avi, stream, index,
(GstClockTime *) & time, NULL, NULL, NULL); (GstClockTime *) & time, NULL, NULL, NULL);
} else if (avi->element_index) { } else if (avi->element_index) {
@ -4151,87 +4156,94 @@ avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, GstEvent * event)
format = fmt; format = fmt;
} }
GST_DEBUG_OBJECT (avi,
"seek requested: rate %g cur %" GST_TIME_FORMAT " stop %"
GST_TIME_FORMAT, rate, GST_TIME_ARGS (cur), GST_TIME_ARGS (stop));
/* FIXME: can we do anything with rate!=1.0 */
keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT); keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT);
GST_DEBUG_OBJECT (avi, "seek to: %" GST_TIME_FORMAT GST_DEBUG_OBJECT (avi,
" keyframe seeking:%d", GST_TIME_ARGS (cur), keyframe); "Seek requested: ts %" GST_TIME_FORMAT " stop %" GST_TIME_FORMAT
", kf %u, rate %lf", GST_TIME_ARGS (cur), GST_TIME_ARGS (stop), keyframe,
rate);
/* FIXME: can we do anything with rate!=1.0 */
/* FIXME, this code assumes the main stream with keyframes is stream 0, /* FIXME, this code assumes the main stream with keyframes is stream 0,
* which is mostly correct... */ * which is mostly correct... */
str_num = avi->main_stream; str_num = avi->main_stream;
stream = &avi->stream[avi->main_stream]; stream = &avi->stream[str_num];
/* get the entry index for the requested position */ /* get the entry index for the requested position */
index = gst_avi_demux_index_for_time (avi, stream, cur); index = gst_avi_demux_index_for_time (avi, stream, cur);
GST_DEBUG_OBJECT (avi, "Got entry %u", index); GST_DEBUG_OBJECT (avi, "str %u: Found entry %u for %" GST_TIME_FORMAT,
str_num, index, GST_TIME_ARGS (cur));
/* check if we are already on a keyframe */ /* check if we are already on a keyframe */
if (!ENTRY_IS_KEYFRAME (&stream->index[index])) { if (!ENTRY_IS_KEYFRAME (&stream->index[index])) {
GST_DEBUG_OBJECT (avi, "not keyframe, searching back"); GST_DEBUG_OBJECT (avi, "Entry is not a keyframe - searching back");
/* now go to the previous keyframe, this is where we should start /* now go to the previous keyframe, this is where we should start
* decoding from. */ * decoding from. */
index = gst_avi_demux_index_prev (avi, stream, index, TRUE); index = gst_avi_demux_index_prev (avi, stream, index, TRUE);
GST_DEBUG_OBJECT (avi, "previous keyframe at %u", index); GST_DEBUG_OBJECT (avi, "Found previous keyframe at %u", index);
} }
gst_avi_demux_get_buffer_info (avi, stream, index, gst_avi_demux_get_buffer_info (avi, stream, index,
&stream->current_timestamp, &stream->current_ts_end, &stream->current_timestamp, &stream->current_ts_end,
&stream->current_offset, &stream->current_offset_end); &stream->current_offset, &stream->current_offset_end);
min_offset = stream->current_offset; /* re-use cur to be the timestamp of the seek as it _will_ be */
cur = stream->current_timestamp;
min_offset = stream->index[index].offset;
GST_DEBUG_OBJECT (avi,
"Seek to: ts %" GST_TIME_FORMAT " (on str %u, idx %u, offset %"
G_GUINT64_FORMAT ")", GST_TIME_ARGS (stream->current_timestamp), str_num,
index, min_offset);
for (n = 0; n < avi->num_streams; n++) { for (n = 0; n < avi->num_streams; n++) {
GstAviStream *str = &avi->stream[n]; GstAviStream *str = &avi->stream[n];
guint idx; guint idx;
guint64 off;
if (n == avi->main_stream) if (n == avi->main_stream)
continue; continue;
/* get the entry index for the requested position */ /* get the entry index for the requested position */
idx = gst_avi_demux_index_for_time (avi, str, stream->current_timestamp); idx = gst_avi_demux_index_for_time (avi, str, cur);
GST_DEBUG_OBJECT (avi, "Got entry %u", idx); GST_DEBUG_OBJECT (avi, "str %u: Found entry %u for %" GST_TIME_FORMAT, n,
idx, GST_TIME_ARGS (cur));
/* check if we are already on a keyframe */ /* check if we are already on a keyframe */
if (!ENTRY_IS_KEYFRAME (&str->index[idx])) { if (!ENTRY_IS_KEYFRAME (&str->index[idx])) {
GST_DEBUG_OBJECT (avi, "not keyframe, searching back"); GST_DEBUG_OBJECT (avi, "Entry is not a keyframe - searching back");
/* now go to the previous keyframe, this is where we should start /* now go to the previous keyframe, this is where we should start
* decoding from. */ * decoding from. */
idx = gst_avi_demux_index_prev (avi, str, idx, TRUE); idx = gst_avi_demux_index_prev (avi, str, idx, TRUE);
GST_DEBUG_OBJECT (avi, "previous keyframe at %u", idx); GST_DEBUG_OBJECT (avi, "Found previous keyframe at %u", idx);
} }
gst_avi_demux_get_buffer_info (avi, str, idx, NULL, NULL, &off, NULL); gst_avi_demux_get_buffer_info (avi, str, idx,
if (off < min_offset) { &str->current_timestamp, &str->current_ts_end,
&str->current_offset, &str->current_offset_end);
if (str->index[idx].offset < min_offset) {
min_offset = str->index[idx].offset;
GST_DEBUG_OBJECT (avi, GST_DEBUG_OBJECT (avi,
"Found an earlier offset at %" G_GUINT64_FORMAT ", str %u", off, n); "Found an earlier offset at %" G_GUINT64_FORMAT ", str %u",
min_offset = off; min_offset, n);
str_num = n; str_num = n;
stream = str; stream = str;
index = idx; index = idx;
} }
} }
gst_avi_demux_get_buffer_info (avi, stream, index, GST_DEBUG_OBJECT (avi,
&stream->current_timestamp, &stream->current_ts_end, "Seek performed: str %u, offset %" G_GUINT64_FORMAT ", idx %u, ts %"
&stream->current_offset, &stream->current_offset_end); GST_TIME_FORMAT ", ts_end %" GST_TIME_FORMAT ", off %" G_GUINT64_FORMAT
", off_end %" G_GUINT64_FORMAT, str_num, min_offset, index,
GST_DEBUG_OBJECT (avi, "Moved to str %u, idx %u, ts %" GST_TIME_FORMAT
", ts_end %" GST_TIME_FORMAT ", off %" G_GUINT64_FORMAT
", off_end %" G_GUINT64_FORMAT, str_num, index,
GST_TIME_ARGS (stream->current_timestamp), GST_TIME_ARGS (stream->current_timestamp),
GST_TIME_ARGS (stream->current_ts_end), stream->current_offset, GST_TIME_ARGS (stream->current_ts_end), stream->current_offset,
stream->current_offset_end); stream->current_offset_end);
GST_DEBUG_OBJECT (avi, "Seeking to offset %" G_GUINT64_FORMAT,
stream->index[index].offset);
if (!perform_seek_to_offset (avi, if (!perform_seek_to_offset (avi,
stream->index[index].offset - (avi->stream[0].indexes ? 8 : 0))) { min_offset - (avi->stream[0].indexes ? 8 : 0))) {
GST_DEBUG_OBJECT (avi, "seek event failed!"); GST_DEBUG_OBJECT (avi, "seek event failed!");
return FALSE; return FALSE;
} }