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: use the index in push mode when we can

Browse source 
When seeking in push mode, try to use the index first before we use the bitrate
estimation.
This commit is contained in:
Wim Taymans 2010-05-04 13:36:58 +02:00
parent 03c3aa6377
commit a57b461af8
1 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
ext/ogg/gstoggdemux.c
View file

@ -1956,7 +1956,7 @@ gst_ogg_demux_do_seek (GstOggDemux * ogg, GstSegment * segment,
gint64 begin, end; gint64 begin, end;
gint64 begintime, endtime; gint64 begintime, endtime;
gint64 target, keytarget; gint64 target, keytarget;
gint64 best, best_time; gint64 best;
gint64 total; gint64 total;
gint64 result = 0; gint64 result = 0;
GstFlowReturn ret; GstFlowReturn ret;
@ -1983,22 +1983,6 @@ gst_ogg_demux_do_seek (GstOggDemux * ogg, GstSegment * segment,
endtime = begintime + chain->total_time; endtime = begintime + chain->total_time;
target = position - total + begintime; target = position - total + begintime;
if (do_index_search (ogg, chain, begin, end, begintime, endtime, target,
&best, &best_time)) {
/* the index gave some result */
GST_DEBUG_OBJECT (ogg,
"found offset %" G_GINT64_FORMAT " with time %" G_GUINT64_FORMAT, best,
best_time);
#if 1
keytarget = best_time + begintime;
best += begin;
gst_ogg_demux_seek (ogg, best);
goto done;
#endif
}
if (!do_binary_search (ogg, chain, begin, end, begintime, endtime, target, if (!do_binary_search (ogg, chain, begin, end, begintime, endtime, target,
&best)) &best))
goto seek_error; goto seek_error;
@ -2376,36 +2360,63 @@ static gboolean
gst_ogg_demux_perform_seek_push (GstOggDemux * ogg, GstEvent * event) gst_ogg_demux_perform_seek_push (GstOggDemux * ogg, GstEvent * event)
{ {
gint bitrate; gint bitrate;
gboolean res; gboolean res = TRUE;
bitrate = ogg->bitrate;
if (bitrate > 0) {
GstFormat format; GstFormat format;
gdouble rate; gdouble rate;
GstSeekFlags flags; GstSeekFlags flags;
GstSeekType start_type, stop_type; GstSeekType start_type, stop_type;
gint64 start, stop; gint64 start, stop;
GstEvent *sevent; GstEvent *sevent;
GstOggChain *chain;
gint64 best, best_time;
gst_event_parse_seek (event, &rate, &format, &flags, gst_event_parse_seek (event, &rate, &format, &flags,
&start_type, &start, &stop_type, &stop); &start_type, &start, &stop_type, &stop);
/* convert the seek positions to bytes */ if (format != GST_FORMAT_TIME) {
GST_DEBUG_OBJECT (ogg, "can only seek on TIME");
goto error;
}
chain = ogg->current_chain;
if (do_index_search (ogg, chain, 0, -1, 0, -1, start, &best, &best_time)) {
/* the index gave some result */
GST_DEBUG_OBJECT (ogg,
"found offset %" G_GINT64_FORMAT " with time %" G_GUINT64_FORMAT,
best, best_time);
start = best;
} else if ((bitrate = ogg->bitrate) > 0) {
/* try with bitrate convert the seek positions to bytes */
if (start_type != GST_SEEK_TYPE_NONE) { if (start_type != GST_SEEK_TYPE_NONE) {
start = gst_util_uint64_scale (start, bitrate, 8 * GST_SECOND); start = gst_util_uint64_scale (start, bitrate, 8 * GST_SECOND);
} }
if (stop_type != GST_SEEK_TYPE_NONE) { if (stop_type != GST_SEEK_TYPE_NONE) {
stop = gst_util_uint64_scale (stop, bitrate, 8 * GST_SECOND); stop = gst_util_uint64_scale (stop, bitrate, 8 * GST_SECOND);
} }
} else {
/* we don't know */
res = FALSE;
}
if (res) {
GST_DEBUG_OBJECT (ogg,
"seeking to %" G_GINT64_FORMAT " - %" G_GINT64_FORMAT, start, stop);
/* do seek */
sevent = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, sevent = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags,
start_type, start, stop_type, stop); start_type, start, stop_type, stop);
res = gst_pad_push_event (ogg->sinkpad, sevent); res = gst_pad_push_event (ogg->sinkpad, sevent);
} else {
res = FALSE;
} }
return res; return res;
/* ERRORS */
error:
{
GST_DEBUG_OBJECT (ogg, "seek failed");
return FALSE;
}
} }
static gboolean static gboolean