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

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

Issue 2307533004: Moving/renaming webrtc/common.h. (Closed)
Patch Set: two nits Created 4 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
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
11 #ifndef WEBRTC_VOICE_ENGINE_SHARED_DATA_H 11 #ifndef WEBRTC_VOICE_ENGINE_SHARED_DATA_H
12 #define WEBRTC_VOICE_ENGINE_SHARED_DATA_H 12 #define WEBRTC_VOICE_ENGINE_SHARED_DATA_H
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/scoped_ref_ptr.h" 17 #include "webrtc/base/scoped_ref_ptr.h"
18 #include "webrtc/modules/audio_device/include/audio_device.h" 18 #include "webrtc/modules/audio_device/include/audio_device.h"
19 #include "webrtc/modules/audio_processing/include/audio_processing.h" 19 #include "webrtc/modules/audio_processing/include/audio_processing.h"
20 #include "webrtc/modules/utility/include/process_thread.h" 20 #include "webrtc/modules/utility/include/process_thread.h"
21 #include "webrtc/voice_engine/channel_manager.h" 21 #include "webrtc/voice_engine/channel_manager.h"
22 #include "webrtc/voice_engine/statistics.h" 22 #include "webrtc/voice_engine/statistics.h"
23 #include "webrtc/voice_engine/voice_engine_defines.h" 23 #include "webrtc/voice_engine/voice_engine_defines.h"
24 24
25 class ProcessThread; 25 class ProcessThread;
26 26
27 namespace webrtc { 27 namespace webrtc {
28 class Config;
29
30 namespace voe { 28 namespace voe {
31 29
32 class TransmitMixer; 30 class TransmitMixer;
33 class OutputMixer; 31 class OutputMixer;
34 32
35 class SharedData 33 class SharedData
36 { 34 {
37 public: 35 public:
38 // Public accessors. 36 // Public accessors.
39 uint32_t instance_id() const { return _instanceId; } 37 uint32_t instance_id() const { return _instanceId; }
(...skipping 30 matching lines...) Expand all
70 ChannelManager _channelManager; 68 ChannelManager _channelManager;
71 Statistics _engineStatistics; 69 Statistics _engineStatistics;
72 rtc::scoped_refptr<AudioDeviceModule> _audioDevicePtr; 70 rtc::scoped_refptr<AudioDeviceModule> _audioDevicePtr;
73 OutputMixer* _outputMixerPtr; 71 OutputMixer* _outputMixerPtr;
74 TransmitMixer* _transmitMixerPtr; 72 TransmitMixer* _transmitMixerPtr;
75 std::unique_ptr<AudioProcessing> audioproc_; 73 std::unique_ptr<AudioProcessing> audioproc_;
76 std::unique_ptr<ProcessThread> _moduleProcessThreadPtr; 74 std::unique_ptr<ProcessThread> _moduleProcessThreadPtr;
77 75
78 AudioDeviceModule::AudioLayer _audioDeviceLayer; 76 AudioDeviceModule::AudioLayer _audioDeviceLayer;
79 77
80 SharedData(const Config& config); 78 SharedData();
81 virtual ~SharedData(); 79 virtual ~SharedData();
82 }; 80 };
83 81
84 } // namespace voe 82 } // namespace voe
85
86 } // namespace webrtc 83 } // namespace webrtc
87 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H 84 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698