| Index: webrtc/media/engine/webrtcvoiceengine.h
|
| diff --git a/webrtc/media/engine/webrtcvoiceengine.h b/webrtc/media/engine/webrtcvoiceengine.h
|
| index ea48544924ae0ce5c096c05a404f7ff5798319d1..0eeef482abfc099c1a82d4a5a5665726ef9ea32f 100644
|
| --- a/webrtc/media/engine/webrtcvoiceengine.h
|
| +++ b/webrtc/media/engine/webrtcvoiceengine.h
|
| @@ -30,6 +30,12 @@
|
| #include "webrtc/modules/audio_processing/include/audio_processing.h"
|
| #include "webrtc/pc/channel.h"
|
|
|
| +namespace webrtc {
|
| +namespace voe {
|
| +class TransmitMixer;
|
| +} // namespace voe
|
| +} // namespace webrtc
|
| +
|
| namespace cricket {
|
|
|
| class AudioDeviceModule;
|
| @@ -75,10 +81,6 @@ class WebRtcVoiceEngine final : public webrtc::TraceCallback {
|
| void RegisterChannel(WebRtcVoiceMediaChannel* channel);
|
| void UnregisterChannel(WebRtcVoiceMediaChannel* channel);
|
|
|
| - // Called by WebRtcVoiceMediaChannel to set a gain offset from
|
| - // the default AGC target level.
|
| - bool AdjustAgcLevel(int delta);
|
| -
|
| VoEWrapper* voe() { return voe_wrapper_.get(); }
|
| int GetLastEngineError();
|
|
|
| @@ -109,6 +111,7 @@ class WebRtcVoiceEngine final : public webrtc::TraceCallback {
|
| int CreateVoEChannel();
|
| webrtc::AudioDeviceModule* adm();
|
| webrtc::AudioProcessing* apm();
|
| + webrtc::voe::TransmitMixer* transmit_mixer();
|
|
|
| AudioCodecs CollectRecvCodecs() const;
|
|
|
| @@ -120,6 +123,8 @@ class WebRtcVoiceEngine final : public webrtc::TraceCallback {
|
| rtc::scoped_refptr<webrtc::AudioDecoderFactory> decoder_factory_;
|
| // Reference to the APM, owned by VoE.
|
| webrtc::AudioProcessing* apm_ = nullptr;
|
| + // Reference to the TransmitMixer, owned by VoE.
|
| + webrtc::voe::TransmitMixer* transmit_mixer_ = nullptr;
|
| // The primary instance of WebRtc VoiceEngine.
|
| std::unique_ptr<VoEWrapper> voe_wrapper_;
|
| rtc::scoped_refptr<webrtc::AudioState> audio_state_;
|
|
|