OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... | |
21 | 21 |
22 namespace webrtc { | 22 namespace webrtc { |
23 namespace internal { | 23 namespace internal { |
24 | 24 |
25 class AudioState final : public webrtc::AudioState, | 25 class AudioState final : public webrtc::AudioState, |
26 public webrtc::VoiceEngineObserver { | 26 public webrtc::VoiceEngineObserver { |
27 public: | 27 public: |
28 explicit AudioState(const AudioState::Config& config); | 28 explicit AudioState(const AudioState::Config& config); |
29 ~AudioState() override; | 29 ~AudioState() override; |
30 | 30 |
31 // TODO(peah): Remove the conditional in the audio_transport_proxy_ | |
32 // constructor call when upstream dependencies have properly been resolved. | |
the sun
2017/06/29 10:41:52
comment is not right, mentioning transport proxy c
peah-webrtc
2017/06/29 11:46:31
Done.
| |
33 AudioProcessing* audio_processing() override { | |
34 return config_.audio_processing ? config_.audio_processing.get() | |
35 : voe_base_->audio_processing(); | |
36 } | |
37 | |
31 VoiceEngine* voice_engine(); | 38 VoiceEngine* voice_engine(); |
32 | |
33 rtc::scoped_refptr<AudioMixer> mixer(); | 39 rtc::scoped_refptr<AudioMixer> mixer(); |
34 bool typing_noise_detected() const; | 40 bool typing_noise_detected() const; |
35 | 41 |
36 private: | 42 private: |
37 // rtc::RefCountInterface implementation. | 43 // rtc::RefCountInterface implementation. |
38 int AddRef() const override; | 44 int AddRef() const override; |
39 int Release() const override; | 45 int Release() const override; |
40 | 46 |
41 // webrtc::VoiceEngineObserver implementation. | 47 // webrtc::VoiceEngineObserver implementation. |
42 void CallbackOnError(int channel_id, int err_code) override; | 48 void CallbackOnError(int channel_id, int err_code) override; |
(...skipping 16 matching lines...) Expand all Loading... | |
59 // Transports mixed audio from the mixer to the audio device and | 65 // Transports mixed audio from the mixer to the audio device and |
60 // recorded audio to the VoE AudioTransport. | 66 // recorded audio to the VoE AudioTransport. |
61 AudioTransportProxy audio_transport_proxy_; | 67 AudioTransportProxy audio_transport_proxy_; |
62 | 68 |
63 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioState); | 69 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioState); |
64 }; | 70 }; |
65 } // namespace internal | 71 } // namespace internal |
66 } // namespace webrtc | 72 } // namespace webrtc |
67 | 73 |
68 #endif // WEBRTC_AUDIO_AUDIO_STATE_H_ | 74 #endif // WEBRTC_AUDIO_AUDIO_STATE_H_ |
OLD | NEW |