mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiomixer: Fix EOS handling if we have some pending data

Browse source
This commit is contained in:
Sebastian Dröge 2013-11-07 14:12:00 +01:00
parent c4092d4575
commit 24ba7af5fa
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/audiomixer/gstaudiomixer.c
View file

@ -1614,7 +1614,6 @@ gst_audiomixer_collected (GstCollectPads * pads, gpointer user_data)
gboolean dropped = FALSE; gboolean dropped = FALSE;
gboolean is_eos = TRUE; gboolean is_eos = TRUE;
gboolean is_done = TRUE; gboolean is_done = TRUE;
gboolean handled_buffer = FALSE;
audiomixer = GST_AUDIO_MIXER (user_data); audiomixer = GST_AUDIO_MIXER (user_data);
@ -1788,7 +1787,6 @@ gst_audiomixer_collected (GstCollectPads * pads, gpointer user_data)
} else { } else {
is_done = FALSE; is_done = FALSE;
} }
handled_buffer = TRUE;
} }
} }
@ -1810,14 +1808,10 @@ gst_audiomixer_collected (GstCollectPads * pads, gpointer user_data)
if (is_eos) { if (is_eos) {
gint64 max_offset = 0; gint64 max_offset = 0;
gboolean empty_buffer = TRUE;
GST_DEBUG_OBJECT (audiomixer, "We're EOS"); GST_DEBUG_OBJECT (audiomixer, "We're EOS");
/* This means EOS or no pads at all */
if (!handled_buffer) {
gst_buffer_replace (&audiomixer->current_buffer, NULL);
goto eos;
}
for (collected = pads->data; collected; collected = collected->next) { for (collected = pads->data; collected; collected = collected->next) {
GstCollectData *collect_data; GstCollectData *collect_data;
@ -1827,6 +1821,14 @@ gst_audiomixer_collected (GstCollectPads * pads, gpointer user_data)
adata = (GstAudioMixerCollect *) collect_data; adata = (GstAudioMixerCollect *) collect_data;
max_offset = MAX (max_offset, adata->output_offset); max_offset = MAX (max_offset, adata->output_offset);
if (adata->output_offset > audiomixer->offset)
empty_buffer = FALSE;
}
/* This means EOS or no pads at all */
if (empty_buffer) {
gst_buffer_replace (&audiomixer->current_buffer, NULL);
goto eos;
} }
if (max_offset <= next_offset) { if (max_offset <= next_offset) {