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

oggdemux: do reverse seeks more accurate

Browse source 
For reverse seeking with the accurate flag set, try to be more precise by
seeking a little bit after the requested position.
This commit is contained in:
Wim Taymans 2009-06-12 13:22:47 +02:00
parent 9ca2bf36de
commit acdb88ec6f
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ext/ogg/gstoggdemux.c
View file

@ -1868,9 +1868,10 @@ gst_ogg_demux_activate_chain (GstOggDemux * ogg, GstOggChain * chain,
* do seek to time @position, return FALSE or chain and TRUE
*/
static gboolean
gst_ogg_demux_do_seek (GstOggDemux * ogg, gint64 position, gboolean accurate,
GstOggChain ** rchain)
gst_ogg_demux_do_seek (GstOggDemux * ogg, GstSegment * segment,
gboolean accurate, GstOggChain ** rchain)
{
guint64 position;
GstOggChain *chain = NULL;
gint64 begin, end;
gint64 begintime, endtime;
@ -1881,6 +1882,8 @@ gst_ogg_demux_do_seek (GstOggDemux * ogg, gint64 position, gboolean accurate,
GstFlowReturn ret;
gint i;
position = segment->last_stop;
/* first find the chain to search in */
total = ogg->total_time;
if (ogg->chains->len == 0)
@ -1896,14 +1899,23 @@ gst_ogg_demux_do_seek (GstOggDemux * ogg, gint64 position, gboolean accurate,
begin = chain->offset;
end = chain->end_offset;
begintime = chain->begin_time;
endtime = chain->begin_time + chain->total_time;
endtime = begintime + chain->total_time;
target = position - total + begintime;
if (accurate) {
/* FIXME, seek 4 seconds early to catch keyframes, better implement
if (segment->rate > 0.0) {
/* FIXME, seek 2 seconds early to catch keyframes, better implement
* keyframe detection. */
target = target - (gint64) 4 *GST_SECOND;
if (target - 2 * GST_SECOND > begintime)
target = target - (gint64) 2 *GST_SECOND;
else
target = begintime;
} else {
if (target + GST_SECOND < endtime)
target = target + (gint64) GST_SECOND;
else
target = endtime;
}
}
target = MAX (target, 0);
best = begin;
GST_DEBUG_OBJECT (ogg,
@ -2175,10 +2187,7 @@ gst_ogg_demux_perform_seek (GstOggDemux * ogg, GstEvent * event)
}
/* for reverse we will already seek accurately */
if (rate < 0.0)
accurate = FALSE;
res = gst_ogg_demux_do_seek (ogg, ogg->segment.last_stop, accurate, &chain);
res = gst_ogg_demux_do_seek (ogg, &ogg->segment, accurate, &chain);
/* seek failed, make sure we continue the current chain */
if (!res) {