diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2014-12-18 23:33:58 +0100 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2014-12-18 23:33:58 +0100 |
commit | 654d20137579c04cd69be2eab7968411e784617f (patch) | |
tree | b558ba301eaaffa483c686aafb9d6c64e3b89160 /gst | |
parent | 0d38b2212ccd2b9164fa19a71ea99bea334c4dde (diff) |
audiomixer: We're only EOS if all our pads are actually EOS
Having a buffer or not on the pad is irrelevant.
Diffstat (limited to 'gst')
-rw-r--r-- | gst/audiomixer/gstaudiomixer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c index e219132cb..0e8c30632 100644 --- a/gst/audiomixer/gstaudiomixer.c +++ b/gst/audiomixer/gstaudiomixer.c @@ -1430,6 +1430,9 @@ gst_audiomixer_aggregate (GstAggregator * agg, gboolean timeout) GstAudioMixerPad *pad = GST_AUDIO_MIXER_PAD (iter->data); GstAggregatorPad *aggpad = GST_AGGREGATOR_PAD (iter->data); + if (!GST_AGGREGATOR_PAD (pad)->eos) + is_eos = FALSE; + inbuf = gst_aggregator_pad_get_buffer (aggpad); if (!inbuf) continue; @@ -1450,8 +1453,6 @@ gst_audiomixer_aggregate (GstAggregator * agg, gboolean timeout) if (!pad->buffer && !dropped && GST_AGGREGATOR_PAD (pad)->eos) { GST_DEBUG_OBJECT (aggpad, "Pad is in EOS state"); continue; - } else { - is_eos = FALSE; } g_assert (pad->buffer); |