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

Side by Side Diff: webrtc/voice_engine/shared_data.h

Issue 2753753004: Remove VoEHardware interface. (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « webrtc/voice_engine/include/voe_hardware.h ('k') | webrtc/voice_engine/shared_data.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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 28 matching lines...) Expand all
39 ChannelManager& channel_manager() { return _channelManager; } 39 ChannelManager& channel_manager() { return _channelManager; }
40 AudioDeviceModule* audio_device() { return _audioDevicePtr.get(); } 40 AudioDeviceModule* audio_device() { return _audioDevicePtr.get(); }
41 void set_audio_device( 41 void set_audio_device(
42 const rtc::scoped_refptr<AudioDeviceModule>& audio_device); 42 const rtc::scoped_refptr<AudioDeviceModule>& audio_device);
43 AudioProcessing* audio_processing() { return audioproc_.get(); } 43 AudioProcessing* audio_processing() { return audioproc_.get(); }
44 void set_audio_processing(AudioProcessing* audio_processing); 44 void set_audio_processing(AudioProcessing* audio_processing);
45 TransmitMixer* transmit_mixer() { return _transmitMixerPtr; } 45 TransmitMixer* transmit_mixer() { return _transmitMixerPtr; }
46 OutputMixer* output_mixer() { return _outputMixerPtr; } 46 OutputMixer* output_mixer() { return _outputMixerPtr; }
47 rtc::CriticalSection* crit_sec() { return &_apiCritPtr; } 47 rtc::CriticalSection* crit_sec() { return &_apiCritPtr; }
48 ProcessThread* process_thread() { return _moduleProcessThreadPtr.get(); } 48 ProcessThread* process_thread() { return _moduleProcessThreadPtr.get(); }
49 AudioDeviceModule::AudioLayer audio_device_layer() const {
50 return _audioDeviceLayer;
51 }
52 void set_audio_device_layer(AudioDeviceModule::AudioLayer layer) {
53 _audioDeviceLayer = layer;
54 }
55 49
56 int NumOfSendingChannels(); 50 int NumOfSendingChannels();
57 int NumOfPlayingChannels(); 51 int NumOfPlayingChannels();
58 52
59 // Convenience methods for calling statistics().SetLastError(). 53 // Convenience methods for calling statistics().SetLastError().
60 void SetLastError(int32_t error) const; 54 void SetLastError(int32_t error) const;
61 void SetLastError(int32_t error, TraceLevel level) const; 55 void SetLastError(int32_t error, TraceLevel level) const;
62 void SetLastError(int32_t error, TraceLevel level, 56 void SetLastError(int32_t error, TraceLevel level,
63 const char* msg) const; 57 const char* msg) const;
64 58
65 protected: 59 protected:
66 const uint32_t _instanceId; 60 const uint32_t _instanceId;
67 rtc::CriticalSection _apiCritPtr; 61 rtc::CriticalSection _apiCritPtr;
68 ChannelManager _channelManager; 62 ChannelManager _channelManager;
69 Statistics _engineStatistics; 63 Statistics _engineStatistics;
70 rtc::scoped_refptr<AudioDeviceModule> _audioDevicePtr; 64 rtc::scoped_refptr<AudioDeviceModule> _audioDevicePtr;
71 OutputMixer* _outputMixerPtr; 65 OutputMixer* _outputMixerPtr;
72 TransmitMixer* _transmitMixerPtr; 66 TransmitMixer* _transmitMixerPtr;
73 std::unique_ptr<AudioProcessing> audioproc_; 67 std::unique_ptr<AudioProcessing> audioproc_;
74 std::unique_ptr<ProcessThread> _moduleProcessThreadPtr; 68 std::unique_ptr<ProcessThread> _moduleProcessThreadPtr;
75 69
76 AudioDeviceModule::AudioLayer _audioDeviceLayer;
77
78 SharedData(); 70 SharedData();
79 virtual ~SharedData(); 71 virtual ~SharedData();
80 }; 72 };
81 73
82 } // namespace voe 74 } // namespace voe
83 } // namespace webrtc 75 } // namespace webrtc
84 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H 76 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/include/voe_hardware.h ('k') | webrtc/voice_engine/shared_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698