projects
/
platform
/
upstream
/
gst-plugins-bad.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ee04b09
)
audiomixer: Don't reset caps on flush
author
Olivier CrĂȘte
<olivier.crete@collabora.com>
Wed, 21 Jan 2015 23:39:24 +0000
(18:39 -0500)
committer
Thibault Saunier
<tsaunier@gnome.org>
Thu, 29 Jan 2015 09:24:18 +0000
(10:24 +0100)
A flush event doesn't invalidate the previous caps event.
https://bugzilla.gnome.org/show_bug.cgi?id=742684
gst/audiomixer/gstaudiomixer.c
patch
|
blob
|
history
diff --git
a/gst/audiomixer/gstaudiomixer.c
b/gst/audiomixer/gstaudiomixer.c
index 01521e517a9a2275b0d5d412c00dc1b2dfa0bc70..44ec1550a453bb5daca6abc1c6558e438179021a 100644
(file)
--- a/
gst/audiomixer/gstaudiomixer.c
+++ b/
gst/audiomixer/gstaudiomixer.c
@@
-751,7
+751,11
@@
gst_audiomixer_stop (GstAggregator * agg)
static GstFlowReturn
gst_audiomixer_flush (GstAggregator * agg)
{
- gst_audiomixer_reset (GST_AUDIO_MIXER (agg));
+ GstAudioMixer *audiomixer = GST_AUDIO_MIXER (agg);
+
+ audiomixer->offset = 0;
+ agg->segment.position = -1;
+ gst_buffer_replace (&audiomixer->current_buffer, NULL);
return GST_FLOW_OK;
}