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

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

Issue 2454373002: Added an empty AudioTransportProxy to AudioState. (Closed)
Patch Set: Rebase. GYP is removed! Created 4 years, 1 month 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
« no previous file with comments | « webrtc/audio/audio_send_stream_unittest.cc ('k') | webrtc/audio/audio_state.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/audio_transport_proxy.h"
15 #include "webrtc/audio/scoped_voe_interface.h" 16 #include "webrtc/audio/scoped_voe_interface.h"
16 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/criticalsection.h" 18 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/thread_checker.h" 19 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/voice_engine/include/voe_base.h" 20 #include "webrtc/voice_engine/include/voe_base.h"
20 21
21 namespace webrtc { 22 namespace webrtc {
22 namespace internal { 23 namespace internal {
23 24
24 class AudioState final : public webrtc::AudioState, 25 class AudioState final : public webrtc::AudioState,
25 public webrtc::VoiceEngineObserver { 26 public webrtc::VoiceEngineObserver {
26 public: 27 public:
27 explicit AudioState(const AudioState::Config& config); 28 explicit AudioState(const AudioState::Config& config);
28 ~AudioState() override; 29 ~AudioState() override;
29 30
30 VoiceEngine* voice_engine(); 31 VoiceEngine* voice_engine();
32
33 rtc::scoped_refptr<AudioMixer> mixer();
31 bool typing_noise_detected() const; 34 bool typing_noise_detected() const;
32 35
33 private: 36 private:
34 // rtc::RefCountInterface implementation. 37 // rtc::RefCountInterface implementation.
35 int AddRef() const override; 38 int AddRef() const override;
36 int Release() const override; 39 int Release() const override;
37 40
38 // webrtc::VoiceEngineObserver implementation. 41 // webrtc::VoiceEngineObserver implementation.
39 void CallbackOnError(int channel_id, int err_code) override; 42 void CallbackOnError(int channel_id, int err_code) override;
40 43
41 rtc::ThreadChecker thread_checker_; 44 rtc::ThreadChecker thread_checker_;
42 rtc::ThreadChecker process_thread_checker_; 45 rtc::ThreadChecker process_thread_checker_;
43 const webrtc::AudioState::Config config_; 46 const webrtc::AudioState::Config config_;
44 47
45 // We hold one interface pointer to the VoE to make sure it is kept alive. 48 // We hold one interface pointer to the VoE to make sure it is kept alive.
46 ScopedVoEInterface<VoEBase> voe_base_; 49 ScopedVoEInterface<VoEBase> voe_base_;
47 50
48 // The critical section isn't strictly needed in this case, but xSAN bots may 51 // The critical section isn't strictly needed in this case, but xSAN bots may
49 // trigger on unprotected cross-thread access. 52 // trigger on unprotected cross-thread access.
50 rtc::CriticalSection crit_sect_; 53 rtc::CriticalSection crit_sect_;
51 bool typing_noise_detected_ GUARDED_BY(crit_sect_) = false; 54 bool typing_noise_detected_ GUARDED_BY(crit_sect_) = false;
52 55
53 // Reference count; implementation copied from rtc::RefCountedObject. 56 // Reference count; implementation copied from rtc::RefCountedObject.
54 mutable volatile int ref_count_ = 0; 57 mutable volatile int ref_count_ = 0;
55 58
59 // Transports mixed audio from the mixer to the audio device and
60 // recorded audio to the VoE AudioTransport.
61 AudioTransportProxy audio_transport_proxy_;
62
56 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioState); 63 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioState);
57 }; 64 };
58 } // namespace internal 65 } // namespace internal
59 } // namespace webrtc 66 } // namespace webrtc
60 67
61 #endif // WEBRTC_AUDIO_AUDIO_STATE_H_ 68 #endif // WEBRTC_AUDIO_AUDIO_STATE_H_
OLDNEW
« no previous file with comments | « webrtc/audio/audio_send_stream_unittest.cc ('k') | webrtc/audio/audio_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698