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

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

Issue 1914153002: Remove calls to ScopedToUnique and UniqueToScoped (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@base-fix
Patch Set: Created 4 years, 8 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/modules/video_capture/test/video_capture_unittest.cc ('k') | no next file » | 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 10 matching lines...) Expand all
21 namespace voe { 21 namespace voe {
22 22
23 static int32_t _gInstanceCounter = 0; 23 static int32_t _gInstanceCounter = 0;
24 24
25 SharedData::SharedData(const Config& config) 25 SharedData::SharedData(const Config& config)
26 : _instanceId(++_gInstanceCounter), 26 : _instanceId(++_gInstanceCounter),
27 _channelManager(_gInstanceCounter, config), 27 _channelManager(_gInstanceCounter, config),
28 _engineStatistics(_gInstanceCounter), 28 _engineStatistics(_gInstanceCounter),
29 _audioDevicePtr(NULL), 29 _audioDevicePtr(NULL),
30 _moduleProcessThreadPtr( 30 _moduleProcessThreadPtr(
31 rtc::ScopedToUnique(ProcessThread::Create("VoiceProcessThread"))) { 31 ProcessThread::Create("VoiceProcessThread")) {
32 Trace::CreateTrace(); 32 Trace::CreateTrace();
33 if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0) 33 if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0)
34 { 34 {
35 _outputMixerPtr->SetEngineInformation(_engineStatistics); 35 _outputMixerPtr->SetEngineInformation(_engineStatistics);
36 } 36 }
37 if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) 37 if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0)
38 { 38 {
39 _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr, 39 _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr,
40 _engineStatistics, 40 _engineStatistics,
41 _channelManager); 41 _channelManager);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 } 101 }
102 102
103 void SharedData::SetLastError(int32_t error, TraceLevel level, 103 void SharedData::SetLastError(int32_t error, TraceLevel level,
104 const char* msg) const { 104 const char* msg) const {
105 _engineStatistics.SetLastError(error, level, msg); 105 _engineStatistics.SetLastError(error, level, msg);
106 } 106 }
107 107
108 } // namespace voe 108 } // namespace voe
109 109
110 } // namespace webrtc 110 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/test/video_capture_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698