| 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..e77f52a9560d3b8298e216e1be4f07783409e4ad 100644
|
| --- a/webrtc/voice_engine/shared_data.cc
|
| +++ b/webrtc/voice_engine/shared_data.cc
|
| @@ -27,19 +27,16 @@ 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") {
|
| + Trace::CreateTrace();
|
| + if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0) {
|
| + _outputMixerPtr->SetEngineInformation(_engineStatistics);
|
| + }
|
| + if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) {
|
| + _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr,
|
| + _engineStatistics, _channelManager);
|
| + }
|
| }
|
|
|
| SharedData::~SharedData()
|
| @@ -53,6 +50,11 @@ SharedData::~SharedData()
|
| Trace::ReturnTrace();
|
| }
|
|
|
| +rtc::TaskQueue* SharedData::encoder_queue() {
|
| + RTC_DCHECK_RUN_ON(&construction_thread_);
|
| + return &encoder_queue_;
|
| +}
|
| +
|
| void SharedData::set_audio_device(
|
| const rtc::scoped_refptr<AudioDeviceModule>& audio_device) {
|
| _audioDevicePtr = audio_device;
|
|
|