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

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

Issue 1267683002: Hooked up RtcEventLog. It lives in Voice Engine and pointers are propagated to ACM and Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added comment regarding pointer lifetime on the VoECodec sub-API. Created 5 years, 4 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 #include "webrtc/voice_engine/shared_data.h" 11 #include "webrtc/voice_engine/shared_data.h"
12 12
13 #include "webrtc/modules/audio_processing/include/audio_processing.h" 13 #include "webrtc/modules/audio_processing/include/audio_processing.h"
14 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 14 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
15 #include "webrtc/system_wrappers/interface/trace.h" 15 #include "webrtc/system_wrappers/interface/trace.h"
16 #include "webrtc/voice_engine/channel.h" 16 #include "webrtc/voice_engine/channel.h"
17 #include "webrtc/voice_engine/output_mixer.h" 17 #include "webrtc/voice_engine/output_mixer.h"
18 #include "webrtc/voice_engine/transmit_mixer.h" 18 #include "webrtc/voice_engine/transmit_mixer.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 namespace voe { 22 namespace voe {
23 23
24 static int32_t _gInstanceCounter = 0; 24 static int32_t _gInstanceCounter = 0;
25 25
26 SharedData::SharedData(const Config& config) : 26 SharedData::SharedData(const Config& config)
27 _instanceId(++_gInstanceCounter), 27 : _instanceId(++_gInstanceCounter),
28 _apiCritPtr(CriticalSectionWrapper::CreateCriticalSection()), 28 _apiCritPtr(CriticalSectionWrapper::CreateCriticalSection()),
29 _channelManager(_gInstanceCounter, config), 29 _channelManager(_gInstanceCounter, config),
30 _engineStatistics(_gInstanceCounter), 30 _engineStatistics(_gInstanceCounter),
31 _audioDevicePtr(NULL), 31 _audioDevicePtr(NULL),
32 _moduleProcessThreadPtr(ProcessThread::Create()), 32 _moduleProcessThreadPtr(ProcessThread::Create()),
33 _externalRecording(false), 33 _externalRecording(false),
34 _externalPlayout(false) 34 _externalPlayout(false) {
35 {
36 Trace::CreateTrace(); 35 Trace::CreateTrace();
37 if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0) 36 if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0)
38 { 37 {
39 _outputMixerPtr->SetEngineInformation(_engineStatistics); 38 _outputMixerPtr->SetEngineInformation(_engineStatistics);
40 } 39 }
41 if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) 40 if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0)
42 { 41 {
43 _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr, 42 _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr,
44 _engineStatistics, 43 _engineStatistics,
45 _channelManager); 44 _channelManager);
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 110 }
112 111
113 void SharedData::SetLastError(int32_t error, TraceLevel level, 112 void SharedData::SetLastError(int32_t error, TraceLevel level,
114 const char* msg) const { 113 const char* msg) const {
115 _engineStatistics.SetLastError(error, level, msg); 114 _engineStatistics.SetLastError(error, level, msg);
116 } 115 }
117 116
118 } // namespace voe 117 } // namespace voe
119 118
120 } // namespace webrtc 119 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698