FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

oggdemux: Improve handling of EOS without source pads

Browse Source 
We might have a chain to use, but it might not have any active pads

Properly detect that and send an error message on EOS
This commit is contained in:
Edward Hervey 2017-10-24 10:56:00 +02:00 committed by Edward Hervey
parent a240880664
commit e8a60b3de9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/ogg/gstoggdemux.c
View File

@ -4638,6 +4638,7 @@ static gboolean
gst_ogg_demux_send_event (GstOggDemux * ogg, GstEvent * event) gst_ogg_demux_send_event (GstOggDemux * ogg, GstEvent * event)
{ {
GstOggChain *chain = ogg->current_chain; GstOggChain *chain = ogg->current_chain;
gboolean event_sent = FALSE;
gboolean res = TRUE; gboolean res = TRUE;
if (!chain) if (!chain)
@ -4651,16 +4652,20 @@ gst_ogg_demux_send_event (GstOggDemux * ogg, GstEvent * event)
gst_event_ref (event); gst_event_ref (event);
GST_DEBUG_OBJECT (pad, "Pushing event %" GST_PTR_FORMAT, event); GST_DEBUG_OBJECT (pad, "Pushing event %" GST_PTR_FORMAT, event);
res &= gst_pad_push_event (GST_PAD (pad), event); if (pad->added) {
res &= gst_pad_push_event (GST_PAD (pad), event);
event_sent = TRUE;
}
} }
} else {
GST_WARNING_OBJECT (ogg, "No chain to forward event to");
if (GST_EVENT_TYPE (event) == GST_EVENT_EOS)
GST_ELEMENT_ERROR (ogg, STREAM, DEMUX, (NULL),
("EOS before finding a chain"));
} }
gst_event_unref (event); gst_event_unref (event);
if (!event_sent && GST_EVENT_TYPE (event) == GST_EVENT_EOS) {
GST_ELEMENT_ERROR (ogg, STREAM, DEMUX, (NULL),
("EOS before finding a chain"));
}
return res; return res;
} }