mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggdemux: Reset last_granule during seeking

Browse source 
Fix case where we would reconstruct the wrong granulepos for
outgoing streams immediately after a seek.
This commit is contained in:
David Schleef 2009-11-25 00:46:55 -08:00
parent 8c202593c6
commit 9339cec787
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/ogg/gstoggdemux.c
View file

@ -355,6 +355,7 @@ gst_ogg_pad_reset (GstOggPad * pad)
pad->last_ret = GST_FLOW_OK; pad->last_ret = GST_FLOW_OK;
pad->last_stop = GST_CLOCK_TIME_NONE; pad->last_stop = GST_CLOCK_TIME_NONE;
pad->current_granule = -1;
} }
/* called when the skeleton fishead is found. Caller ensures the packet is /* called when the skeleton fishead is found. Caller ensures the packet is
@ -527,7 +528,8 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet)
goto done; goto done;
/* store current granule pos */ /* store current granule pos */
ogg->current_granule = packet->granulepos; ogg->current_granule = gst_ogg_stream_granulepos_to_granule (&pad->map,
packet->granulepos);
/* convert to time */ /* convert to time */
current_time = gst_ogg_stream_get_end_time_for_granulepos (&pad->map, current_time = gst_ogg_stream_get_end_time_for_granulepos (&pad->map,
@ -595,7 +597,8 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet)
gst_ogg_pad_parse_skeleton_fisbone (pad, packet); gst_ogg_pad_parse_skeleton_fisbone (pad, packet);
} }
granule = packet->granulepos; granule = gst_ogg_stream_granulepos_to_granule (&pad->map,
packet->granulepos);
if (granule != -1) { if (granule != -1) {
GST_DEBUG_OBJECT (ogg, "%p has granulepos %" G_GINT64_FORMAT, pad, granule); GST_DEBUG_OBJECT (ogg, "%p has granulepos %" G_GINT64_FORMAT, pad, granule);
ogg->current_granule = granule; ogg->current_granule = granule;