| OLD | NEW |
| 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 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 SharedData::SharedData() | 24 SharedData::SharedData() |
| 25 : _instanceId(++_gInstanceCounter), | 25 : _instanceId(++_gInstanceCounter), |
| 26 _channelManager(_gInstanceCounter), | 26 _channelManager(_gInstanceCounter), |
| 27 _engineStatistics(_gInstanceCounter), | 27 _engineStatistics(_gInstanceCounter), |
| 28 _audioDevicePtr(NULL), | 28 _audioDevicePtr(NULL), |
| 29 _moduleProcessThreadPtr(ProcessThread::Create("VoiceProcessThread")), | 29 _moduleProcessThreadPtr(ProcessThread::Create("VoiceProcessThread")), |
| 30 encoder_queue_("AudioEncoderQueue") { | 30 encoder_queue_("AudioEncoderQueue") { |
| 31 Trace::CreateTrace(); | 31 Trace::CreateTrace(); |
| 32 if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) { | 32 if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) { |
| 33 _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr, | 33 _transmitMixerPtr->SetEngineInformation(&_channelManager); |
| 34 _engineStatistics, _channelManager); | |
| 35 } | 34 } |
| 36 } | 35 } |
| 37 | 36 |
| 38 SharedData::~SharedData() | 37 SharedData::~SharedData() |
| 39 { | 38 { |
| 40 TransmitMixer::Destroy(_transmitMixerPtr); | 39 TransmitMixer::Destroy(_transmitMixerPtr); |
| 41 if (_audioDevicePtr) { | 40 if (_audioDevicePtr) { |
| 42 _audioDevicePtr->Release(); | 41 _audioDevicePtr->Release(); |
| 43 } | 42 } |
| 44 _moduleProcessThreadPtr->Stop(); | 43 _moduleProcessThreadPtr->Stop(); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 } | 94 } |
| 96 | 95 |
| 97 void SharedData::SetLastError(int32_t error, TraceLevel level, | 96 void SharedData::SetLastError(int32_t error, TraceLevel level, |
| 98 const char* msg) const { | 97 const char* msg) const { |
| 99 _engineStatistics.SetLastError(error, level, msg); | 98 _engineStatistics.SetLastError(error, level, msg); |
| 100 } | 99 } |
| 101 | 100 |
| 102 } // namespace voe | 101 } // namespace voe |
| 103 | 102 |
| 104 } // namespace webrtc | 103 } // namespace webrtc |
| OLD | NEW |