From a872aac9f87dfd1b7fbeff46a9f0361cefc15eef Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 6 Oct 2005 13:11:55 +0000 Subject: [PATCH] ext/ogg/gstoggdemux.c: Report the FLOW_RETURN as string in the error message. 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. --- ChangeLog | 8 ++++++++ ext/ogg/gstoggdemux.c | 4 ++-- gst-libs/gst/audio/gstringbuffer.c | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26bd114..3dc2c2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-10-06 Wim Taymans + + * 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 * gst/playback/gstplaybasebin.c: (group_destroy), diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 1c4c544..9348e92 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -2271,12 +2271,12 @@ chain_read_failed: } 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); if (GST_FLOW_IS_FATAL (ret)) { gst_ogg_demux_send_event (ogg, gst_event_new_eos ()); GST_ELEMENT_ERROR (ogg, STREAM, STOPPED, - (NULL), ("stream stopped, reason %d", ret)); + (NULL), ("stream stopped, reason %s", gst_flow_get_name (ret))); } return; } diff --git a/gst-libs/gst/audio/gstringbuffer.c b/gst-libs/gst/audio/gstringbuffer.c index 7e65d30..6ac0ba4 100644 --- a/gst-libs/gst/audio/gstringbuffer.c +++ b/gst-libs/gst/audio/gstringbuffer.c @@ -852,7 +852,10 @@ gst_ring_buffer_clear_all (GstRingBuffer * buf) gint i; 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"); -- 2.7.4