| Index: webrtc/voice_engine/shared_data.cc
|
| diff --git a/webrtc/voice_engine/shared_data.cc b/webrtc/voice_engine/shared_data.cc
|
| index 57a1a59b0de3d9515c95bb5cfa48ee625d1b3184..fb997cb882419263f3aa0045ba2ee52e055a9e27 100644
|
| --- a/webrtc/voice_engine/shared_data.cc
|
| +++ b/webrtc/voice_engine/shared_data.cc
|
| @@ -16,6 +16,8 @@
|
| #include "webrtc/voice_engine/output_mixer.h"
|
| #include "webrtc/voice_engine/transmit_mixer.h"
|
|
|
| +#include "webrtc/base/logging.h"
|
| +
|
| namespace webrtc {
|
|
|
| namespace voe {
|
| @@ -27,23 +29,22 @@ SharedData::SharedData()
|
| _channelManager(_gInstanceCounter),
|
| _engineStatistics(_gInstanceCounter),
|
| _audioDevicePtr(NULL),
|
| - _moduleProcessThreadPtr(
|
| - ProcessThread::Create("VoiceProcessThread")) {
|
| - Trace::CreateTrace();
|
| - if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0)
|
| - {
|
| - _outputMixerPtr->SetEngineInformation(_engineStatistics);
|
| - }
|
| - if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0)
|
| - {
|
| - _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr,
|
| - _engineStatistics,
|
| - _channelManager);
|
| - }
|
| + _moduleProcessThreadPtr(ProcessThread::Create("VoiceProcessThread")),
|
| + encoder_queue_("AudioEncoderQueue", rtc::TaskQueue::Priority::HIGH) {
|
| + LOG(INFO) << "___ctor";
|
| + Trace::CreateTrace();
|
| + if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0) {
|
| + _outputMixerPtr->SetEngineInformation(_engineStatistics);
|
| + }
|
| + if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) {
|
| + _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr,
|
| + _engineStatistics, _channelManager);
|
| + }
|
| }
|
|
|
| SharedData::~SharedData()
|
| {
|
| + LOG(INFO) << "___dtor";
|
| OutputMixer::Destroy(_outputMixerPtr);
|
| TransmitMixer::Destroy(_transmitMixerPtr);
|
| if (_audioDevicePtr) {
|
|
|