ext/ogg/gstoggdemux.c: Don't just ignore return values from _pad_push().

Original commit message from CVS:
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_submit_page),
(gst_ogg_demux_chain):
Don't just ignore return values from _pad_push().
Small debug improvements.
This commit is contained in:
Wim Taymans 2006-11-23 11:07:23 +00:00
parent e58d5a5515
commit 9404478d21
2 changed files with 14 additions and 2 deletions

View file

@ -1,3 +1,10 @@
2006-11-23 Wim Taymans <wim@fluendo.com>
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_submit_page),
(gst_ogg_demux_chain):
Don't just ignore return values from _pad_push().
Small debug improvements.
2006-11-23 Michael Smith <msmith@fluendo.com> 2006-11-23 Michael Smith <msmith@fluendo.com>
* ext/ogg/gstoggmux.c: (gst_ogg_mux_process_best_pad): * ext/ogg/gstoggmux.c: (gst_ogg_mux_process_best_pad):

View file

@ -1193,17 +1193,22 @@ gst_ogg_pad_submit_page (GstOggPad * pad, ogg_page * page)
if (ogg_stream_pagein (&pad->stream, page) != 0) if (ogg_stream_pagein (&pad->stream, page) != 0)
goto choked; goto choked;
if (ogg_page_continued (page))
GST_LOG_OBJECT (ogg, "have continued page");
while (!done) { while (!done) {
ret = ogg_stream_packetout (&pad->stream, &packet); ret = ogg_stream_packetout (&pad->stream, &packet);
GST_LOG_OBJECT (ogg, "packetout gave %d", ret);
switch (ret) { switch (ret) {
case 0: case 0:
GST_LOG_OBJECT (ogg, "packetout done");
done = TRUE; done = TRUE;
break; break;
case -1: case -1:
GST_LOG_OBJECT (ogg, "packetout discont");
gst_ogg_chain_mark_discont (pad->chain); gst_ogg_chain_mark_discont (pad->chain);
break; break;
case 1: case 1:
GST_LOG_OBJECT (ogg, "packetout gave packet of size %u", packet.bytes);
result = gst_ogg_pad_submit_packet (pad, &packet); result = gst_ogg_pad_submit_packet (pad, &packet);
if (GST_FLOW_IS_FATAL (result)) if (GST_FLOW_IS_FATAL (result))
goto could_not_submit; goto could_not_submit;
@ -2728,7 +2733,7 @@ gst_ogg_demux_chain (GstPad * pad, GstBuffer * buffer)
if (ret == -1) { if (ret == -1) {
/* discontinuity in the pages */ /* discontinuity in the pages */
} else { } else {
gst_ogg_demux_handle_page (ogg, &page); result = gst_ogg_demux_handle_page (ogg, &page);
} }
} }
return result; return result;