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

ext/ogg/gstoggdemux.c: Report the FLOW_RETURN as string in the error message.

Browse source 
Original commit message from CVS:
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_loop):
Report the FLOW_RETURN as string in the error message.

* gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_clear_all):
Don't assert when clearing an unnegotiated buffer.
This commit is contained in:
Wim Taymans 2005-10-06 13:11:55 +00:00
parent 13331c4636
commit a872aac9f8
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-10-06 Wim Taymans <wim@fluendo.com>
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_loop):
Report the FLOW_RETURN as string in the error message.
* gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_clear_all):
Don't assert when clearing an unnegotiated buffer.
2005-10-04 Michael Smith <msmith@fluendo.com> 2005-10-04 Michael Smith <msmith@fluendo.com>
* gst/playback/gstplaybasebin.c: (group_destroy), * gst/playback/gstplaybasebin.c: (group_destroy),

4
ext/ogg/gstoggdemux.c
View file

@ -2271,12 +2271,12 @@ chain_read_failed:
} }
pause: pause:
{ {
GST_LOG_OBJECT (ogg, "pausing task, reason %d", ret); GST_LOG_OBJECT (ogg, "pausing task, reason %s", gst_flow_get_name (ret));
gst_pad_pause_task (ogg->sinkpad); gst_pad_pause_task (ogg->sinkpad);
if (GST_FLOW_IS_FATAL (ret)) { if (GST_FLOW_IS_FATAL (ret)) {
gst_ogg_demux_send_event (ogg, gst_event_new_eos ()); gst_ogg_demux_send_event (ogg, gst_event_new_eos ());
GST_ELEMENT_ERROR (ogg, STREAM, STOPPED, GST_ELEMENT_ERROR (ogg, STREAM, STOPPED,
(NULL), ("stream stopped, reason %d", ret)); (NULL), ("stream stopped, reason %s", gst_flow_get_name (ret)));
} }
return; return;
} }

5
gst-libs/gst/audio/gstringbuffer.c
View file

@ -852,7 +852,10 @@ gst_ring_buffer_clear_all (GstRingBuffer * buf)
gint i; gint i;
g_return_if_fail (buf != NULL); g_return_if_fail (buf != NULL);
g_return_if_fail (buf->spec.segtotal > 0);
/* not fatal, we just are not negotiated yet */
if (buf->spec.segtotal <= 0)
return;
GST_DEBUG ("clear all segments"); GST_DEBUG ("clear all segments");