Index: webrtc/modules/audio_mixer/audio_mixer_impl.h |
diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.h b/webrtc/modules/audio_mixer/audio_mixer_impl.h |
index 500bb7862e5defe2b9fd906c057c6cf60fec3087..fdc097653094fe64c8e81c3a4780df8fe6548d85 100644 |
--- a/webrtc/modules/audio_mixer/audio_mixer_impl.h |
+++ b/webrtc/modules/audio_mixer/audio_mixer_impl.h |
@@ -35,9 +35,12 @@ class AudioMixerImpl : public AudioMixer { |
Source* audio_source = nullptr; |
bool is_mixed = false; |
float gain = 0.0f; |
+ |
+ // A frame that will be passed to audio_source->GetAudioFrameWithInfo. |
+ AudioFrame audio_frame{}; |
the sun
2016/10/18 14:06:17
Do you really need the {} ?
Also, I thought this t
aleloi
2016/10/18 14:17:48
It's a (brace) default member initializer (http://
the sun
2016/10/18 14:21:45
The default ctor will be called without the {}.
aleloi
2016/10/18 14:30:41
Right, because it is a class and then the default
|
}; |
- typedef std::vector<SourceStatus> SourceStatusList; |
+ using SourceStatusList = std::vector<std::unique_ptr<SourceStatus>>; |
// AudioProcessing only accepts 10 ms frames. |
static const int kFrameDurationInMs = 10; |