Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Side by Side Diff: webrtc/audio/audio_state.h

Issue 2377023002: Now pass ADM as a constructor argument to audio_state. (Closed)
Patch Set: Removed audio_transport() mock calls in tests. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
11 #ifndef WEBRTC_AUDIO_AUDIO_STATE_H_ 11 #ifndef WEBRTC_AUDIO_AUDIO_STATE_H_
12 #define WEBRTC_AUDIO_AUDIO_STATE_H_ 12 #define WEBRTC_AUDIO_AUDIO_STATE_H_
13 13
14 #include "webrtc/api/call/audio_state.h" 14 #include "webrtc/api/call/audio_state.h"
15 #include "webrtc/audio/scoped_voe_interface.h" 15 #include "webrtc/audio/scoped_voe_interface.h"
16 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/thread_checker.h" 18 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/voice_engine/include/voe_base.h" 19 #include "webrtc/voice_engine/include/voe_base.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 namespace internal { 22 namespace internal {
23 23
24 class AudioState final : public webrtc::AudioState, 24 class AudioState final : public webrtc::AudioState,
25 public webrtc::VoiceEngineObserver { 25 public webrtc::VoiceEngineObserver {
26 public: 26 public:
27 explicit AudioState(const AudioState::Config& config); 27 explicit AudioState(const AudioState::Config& config,
28 webrtc::AudioDeviceModule* adm);
28 ~AudioState() override; 29 ~AudioState() override;
29 30
30 VoiceEngine* voice_engine(); 31 VoiceEngine* voice_engine();
32 AudioDeviceModule* audio_device();
31 bool typing_noise_detected() const; 33 bool typing_noise_detected() const;
32 34
33 private: 35 private:
34 // rtc::RefCountInterface implementation. 36 // rtc::RefCountInterface implementation.
35 int AddRef() const override; 37 int AddRef() const override;
36 int Release() const override; 38 int Release() const override;
37 39
38 // webrtc::VoiceEngineObserver implementation. 40 // webrtc::VoiceEngineObserver implementation.
39 void CallbackOnError(int channel_id, int err_code) override; 41 void CallbackOnError(int channel_id, int err_code) override;
40 42
41 rtc::ThreadChecker thread_checker_; 43 rtc::ThreadChecker thread_checker_;
42 rtc::ThreadChecker process_thread_checker_; 44 rtc::ThreadChecker process_thread_checker_;
43 const webrtc::AudioState::Config config_; 45 const webrtc::AudioState::Config config_;
44 46
45 // We hold one interface pointer to the VoE to make sure it is kept alive. 47 // We hold one interface pointer to the VoE to make sure it is kept alive.
46 ScopedVoEInterface<VoEBase> voe_base_; 48 ScopedVoEInterface<VoEBase> voe_base_;
47 49
48 // The critical section isn't strictly needed in this case, but xSAN bots may 50 // The critical section isn't strictly needed in this case, but xSAN bots may
49 // trigger on unprotected cross-thread access. 51 // trigger on unprotected cross-thread access.
50 rtc::CriticalSection crit_sect_; 52 rtc::CriticalSection crit_sect_;
51 bool typing_noise_detected_ GUARDED_BY(crit_sect_) = false; 53 bool typing_noise_detected_ GUARDED_BY(crit_sect_) = false;
52 54
53 // Reference count; implementation copied from rtc::RefCountedObject. 55 // Reference count; implementation copied from rtc::RefCountedObject.
54 mutable volatile int ref_count_ = 0; 56 mutable volatile int ref_count_ = 0;
55 57
58 rtc::scoped_refptr<AudioDeviceModule> adm_;
59
56 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioState); 60 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioState);
57 }; 61 };
58 } // namespace internal 62 } // namespace internal
59 } // namespace webrtc 63 } // namespace webrtc
60 64
61 #endif // WEBRTC_AUDIO_AUDIO_STATE_H_ 65 #endif // WEBRTC_AUDIO_AUDIO_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698