mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ogg/gstoggdemux.c: Fix for segment-start/stop API change.

Browse source 
Original commit message from CVS:
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_chain_peer),
(gst_ogg_demux_perform_seek), (gst_ogg_demux_loop):
Fix for segment-start/stop API change.
This commit is contained in:
Wim Taymans 2005-10-18 13:20:29 +00:00
parent 3fcc19cac0
commit ceaa930f24
2 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-10-18 Wim Taymans <wim@fluendo.com>
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_chain_peer),
(gst_ogg_demux_perform_seek), (gst_ogg_demux_loop):
Fix for segment-start/stop API change.
2005-10-18 Wim Taymans <wim@fluendo.com> 2005-10-18 Wim Taymans <wim@fluendo.com>
* check/Makefile.am: * check/Makefile.am:

28
ext/ogg/gstoggdemux.c
View file

@ -749,7 +749,7 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet)
if (ret == GST_FLOW_NOT_LINKED) if (ret == GST_FLOW_NOT_LINKED)
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
if (packet->granulepos != -1) { if (packet->granulepos >= 0) {
GstFormat format; GstFormat format;
ogg->current_granule = packet->granulepos; ogg->current_granule = packet->granulepos;
@ -1472,6 +1472,9 @@ gst_ogg_demux_perform_seek (GstOggDemux * ogg, gboolean accurate,
/* first find the chain to search in */ /* first find the chain to search in */
total = ogg->total_time; total = ogg->total_time;
if (ogg->chains->len == 0)
goto no_chains;
for (i = ogg->chains->len - 1; i >= 0; i--) { for (i = ogg->chains->len - 1; i >= 0; i--) {
chain = g_array_index (ogg->chains, GstOggChain *, i); chain = g_array_index (ogg->chains, GstOggChain *, i);
total -= chain->total_time; total -= chain->total_time;
@ -1633,7 +1636,8 @@ gst_ogg_demux_perform_seek (GstOggDemux * ogg, gboolean accurate,
/* notify start of new segment */ /* notify start of new segment */
if (ogg->segment_play) { if (ogg->segment_play) {
gst_element_post_message (GST_ELEMENT (ogg), gst_element_post_message (GST_ELEMENT (ogg),
gst_message_new_segment_start (GST_OBJECT (ogg), ogg->segment_start)); gst_message_new_segment_start (GST_OBJECT (ogg), GST_FORMAT_TIME,
ogg->segment_start));
} }
/* restart our task since it might have been stopped when we did the /* restart our task since it might have been stopped when we did the
* flush. */ * flush. */
@ -1646,11 +1650,20 @@ gst_ogg_demux_perform_seek (GstOggDemux * ogg, gboolean accurate,
return TRUE; return TRUE;
seek_error: no_chains:
GST_DEBUG_OBJECT (ogg, "got a seek error"); {
GST_STREAM_UNLOCK (ogg->sinkpad); GST_DEBUG_OBJECT (ogg, "no chains");
GST_STREAM_UNLOCK (ogg->sinkpad);
return FALSE; return FALSE;
}
seek_error:
{
GST_DEBUG_OBJECT (ogg, "got a seek error");
GST_STREAM_UNLOCK (ogg->sinkpad);
return FALSE;
}
} }
/* finds each bitstream link one at a time using a bisection search /* finds each bitstream link one at a time using a bisection search
@ -2243,7 +2256,8 @@ gst_ogg_demux_loop (GstOggPad * pad)
* can check against segment_stop time. */ * can check against segment_stop time. */
if (ogg->segment_play) { if (ogg->segment_play) {
gst_element_post_message (GST_ELEMENT (ogg), gst_element_post_message (GST_ELEMENT (ogg),
gst_message_new_segment_done (GST_OBJECT (ogg), ogg->total_time)); gst_message_new_segment_done (GST_OBJECT (ogg), GST_FORMAT_TIME,
ogg->total_time));
} else { } else {
gst_ogg_demux_send_event (ogg, gst_event_new_eos ()); gst_ogg_demux_send_event (ogg, gst_event_new_eos ());
} }