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

ext/ogg/gstoggmux.c: Fix the cases where oggmux doesn't properly figure out that all sinkpads have gone EOS, and ther...

Browse source 
Original commit message from CVS:
* ext/ogg/gstoggmux.c: (all_pads_eos), (gst_ogg_mux_collected):
Fix the cases where oggmux doesn't properly figure out that all
sinkpads have gone EOS, and therefore doesn't push out the remaining
buffers and the final EOS event.
Fixes #363379
This commit is contained in:
Edward Hervey 2007-01-23 14:30:28 +00:00
parent 60dad35de0
commit 0fcb92f2dd
2 changed files with 58 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-01-23 Edward Hervey <edward@fluendo.com>
* ext/ogg/gstoggmux.c: (all_pads_eos), (gst_ogg_mux_collected):
Fix the cases where oggmux doesn't properly figure out that all
sinkpads have gone EOS, and therefore doesn't push out the remaining
buffers and the final EOS event.
Fixes #363379
2007-01-23 Julien MOUTTE <julien@moutte.net> 2007-01-23 Julien MOUTTE <julien@moutte.net>
* sys/ximage/ximagesink.c: (gst_ximagesink_handle_xevents): * sys/ximage/ximagesink.c: (gst_ximagesink_handle_xevents):

60
ext/ogg/gstoggmux.c
View file

@ -1491,6 +1491,35 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best)
return GST_FLOW_OK; return GST_FLOW_OK;
} }
/** all_pads_eos:
*
* Checks if all pads are EOS'd by peeking.
*
* Returns TRUE if all pads are EOS.
*/
static gboolean
all_pads_eos (GstCollectPads * pads)
{
GSList *walk;
gboolean alleos = TRUE;
walk = pads->data;
while (walk) {
GstBuffer *buf;
GstCollectData *data = (GstCollectData *) walk->data;
buf = gst_collect_pads_peek (pads, data);
if (buf) {
alleos = FALSE;
gst_buffer_unref (buf);
goto beach;
}
walk = walk->next;
}
beach:
return alleos;
}
/* This function is called when there is data on all pads. /* This function is called when there is data on all pads.
* *
* It finds a pad to pull on, this is done by looking at the buffers * It finds a pad to pull on, this is done by looking at the buffers
@ -1506,9 +1535,12 @@ gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux)
{ {
GstOggPad *best; GstOggPad *best;
GstFlowReturn ret; GstFlowReturn ret;
gint activebefore;
GST_LOG_OBJECT (ogg_mux, "collected"); GST_LOG_OBJECT (ogg_mux, "collected");
activebefore = ogg_mux->active_pads;
/* queue buffers on all pads; find a buffer with the lowest timestamp */ /* queue buffers on all pads; find a buffer with the lowest timestamp */
best = gst_ogg_mux_queue_pads (ogg_mux); best = gst_ogg_mux_queue_pads (ogg_mux);
if (best && !best->buffer) { if (best && !best->buffer) {
@ -1522,18 +1554,26 @@ gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux)
ret = gst_ogg_mux_process_best_pad (ogg_mux, best); ret = gst_ogg_mux_process_best_pad (ogg_mux, best);
/* if all the pads have been removed, flush all pending data */ if (ogg_mux->active_pads < activebefore) {
if ((ret == GST_FLOW_OK) && (ogg_mux->active_pads == 0)) { /* If the active pad count went down, this mean at least one pad has gone
GST_LOG_OBJECT (ogg_mux, "no pads remaining, flushing data"); * EOS. Since CollectPads only calls _collected() once when all pads are
* EOS, and our code doesn't _pop() from all pads we need to check that by
* peeking on all pads, else we won't be called again and the muxing will
* not terminate (push out EOS). */
do { /* if all the pads have been removed, flush all pending data */
best = gst_ogg_mux_queue_pads (ogg_mux); if ((ret == GST_FLOW_OK) && all_pads_eos (pads)) {
if (best) GST_LOG_OBJECT (ogg_mux, "no pads remaining, flushing data");
ret = gst_ogg_mux_process_best_pad (ogg_mux, best);
} while ((ret == GST_FLOW_OK) && (best != NULL));
GST_DEBUG_OBJECT (ogg_mux, "Pushing EOS"); do {
gst_pad_push_event (ogg_mux->srcpad, gst_event_new_eos ()); best = gst_ogg_mux_queue_pads (ogg_mux);
if (best)
ret = gst_ogg_mux_process_best_pad (ogg_mux, best);
} while ((ret == GST_FLOW_OK) && (best != NULL));
GST_DEBUG_OBJECT (ogg_mux, "Pushing EOS");
gst_pad_push_event (ogg_mux->srcpad, gst_event_new_eos ());
}
} }
return ret; return ret;