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

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

Issue 1304933008: Remove unnecessary fields from VoE SharedData. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 3 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 | « no previous file | 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 26 matching lines...) Expand all
37 uint32_t instance_id() const { return _instanceId; } 37 uint32_t instance_id() const { return _instanceId; }
38 Statistics& statistics() { return _engineStatistics; } 38 Statistics& statistics() { return _engineStatistics; }
39 ChannelManager& channel_manager() { return _channelManager; } 39 ChannelManager& channel_manager() { return _channelManager; }
40 AudioDeviceModule* audio_device() { return _audioDevicePtr; } 40 AudioDeviceModule* audio_device() { return _audioDevicePtr; }
41 void set_audio_device(AudioDeviceModule* audio_device); 41 void set_audio_device(AudioDeviceModule* audio_device);
42 AudioProcessing* audio_processing() { return audioproc_.get(); } 42 AudioProcessing* audio_processing() { return audioproc_.get(); }
43 void set_audio_processing(AudioProcessing* audio_processing); 43 void set_audio_processing(AudioProcessing* audio_processing);
44 TransmitMixer* transmit_mixer() { return _transmitMixerPtr; } 44 TransmitMixer* transmit_mixer() { return _transmitMixerPtr; }
45 OutputMixer* output_mixer() { return _outputMixerPtr; } 45 OutputMixer* output_mixer() { return _outputMixerPtr; }
46 CriticalSectionWrapper* crit_sec() { return _apiCritPtr; } 46 CriticalSectionWrapper* crit_sec() { return _apiCritPtr; }
47 bool ext_recording() const { return _externalRecording; }
48 void set_ext_recording(bool value) { _externalRecording = value; }
49 bool ext_playout() const { return _externalPlayout; }
50 void set_ext_playout(bool value) { _externalPlayout = value; }
51 ProcessThread* process_thread() { return _moduleProcessThreadPtr.get(); } 47 ProcessThread* process_thread() { return _moduleProcessThreadPtr.get(); }
52 AudioDeviceModule::AudioLayer audio_device_layer() const { 48 AudioDeviceModule::AudioLayer audio_device_layer() const {
53 return _audioDeviceLayer; 49 return _audioDeviceLayer;
54 } 50 }
55 void set_audio_device_layer(AudioDeviceModule::AudioLayer layer) { 51 void set_audio_device_layer(AudioDeviceModule::AudioLayer layer) {
56 _audioDeviceLayer = layer; 52 _audioDeviceLayer = layer;
57 } 53 }
58 54
59 int NumOfSendingChannels(); 55 int NumOfSendingChannels();
60 int NumOfPlayingChannels(); 56 int NumOfPlayingChannels();
61 57
62 // Convenience methods for calling statistics().SetLastError(). 58 // Convenience methods for calling statistics().SetLastError().
63 void SetLastError(int32_t error) const; 59 void SetLastError(int32_t error) const;
64 void SetLastError(int32_t error, TraceLevel level) const; 60 void SetLastError(int32_t error, TraceLevel level) const;
65 void SetLastError(int32_t error, TraceLevel level, 61 void SetLastError(int32_t error, TraceLevel level,
66 const char* msg) const; 62 const char* msg) const;
67 63
68 protected: 64 protected:
69 const uint32_t _instanceId; 65 const uint32_t _instanceId;
70 CriticalSectionWrapper* _apiCritPtr; 66 CriticalSectionWrapper* _apiCritPtr;
71 ChannelManager _channelManager; 67 ChannelManager _channelManager;
72 Statistics _engineStatistics; 68 Statistics _engineStatistics;
73 AudioDeviceModule* _audioDevicePtr; 69 AudioDeviceModule* _audioDevicePtr;
74 OutputMixer* _outputMixerPtr; 70 OutputMixer* _outputMixerPtr;
75 TransmitMixer* _transmitMixerPtr; 71 TransmitMixer* _transmitMixerPtr;
76 rtc::scoped_ptr<AudioProcessing> audioproc_; 72 rtc::scoped_ptr<AudioProcessing> audioproc_;
77 rtc::scoped_ptr<ProcessThread> _moduleProcessThreadPtr; 73 rtc::scoped_ptr<ProcessThread> _moduleProcessThreadPtr;
78 74
79 bool _externalRecording;
80 bool _externalPlayout;
81
82 AudioDeviceModule::AudioLayer _audioDeviceLayer; 75 AudioDeviceModule::AudioLayer _audioDeviceLayer;
83 76
84 SharedData(const Config& config); 77 SharedData(const Config& config);
85 virtual ~SharedData(); 78 virtual ~SharedData();
86 }; 79 };
87 80
88 } // namespace voe 81 } // namespace voe
89 82
90 } // namespace webrtc 83 } // namespace webrtc
91 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H 84 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H
OLDNEW
« no previous file with comments | « no previous file | webrtc/voice_engine/shared_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698