| Index: webrtc/audio/audio_state.h
|
| diff --git a/webrtc/audio/audio_state.h b/webrtc/audio/audio_state.h
|
| index 29b5a9edbf2591267777f796d51439159318b0bb..8a98d5739ef2e2811935c9a96a4cafbd724d8132 100644
|
| --- a/webrtc/audio/audio_state.h
|
| +++ b/webrtc/audio/audio_state.h
|
| @@ -28,8 +28,14 @@ class AudioState final : public webrtc::AudioState,
|
| explicit AudioState(const AudioState::Config& config);
|
| ~AudioState() override;
|
|
|
| - VoiceEngine* voice_engine();
|
| + // TODO(peah): Remove the conditional when upstream dependencies have properly
|
| + // been resolved.
|
| + AudioProcessing* audio_processing() override {
|
| + return config_.audio_processing ? config_.audio_processing.get()
|
| + : voe_base_->audio_processing();
|
| + }
|
|
|
| + VoiceEngine* voice_engine();
|
| rtc::scoped_refptr<AudioMixer> mixer();
|
| bool typing_noise_detected() const;
|
|
|
|
|