Open backdoor in VoiceEngineImpl to get at the actual voe::Channel objects from an ID.

webrtc/voice_engine/voice_engine_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #if defined(WEBRTC_ANDROID)
 #include "webrtc/modules/audio_device/android/audio_device_template.h"
 #include "webrtc/modules/audio_device/android/audio_record_jni.h"
 #include "webrtc/modules/audio_device/android/audio_track_jni.h"
 #include "webrtc/modules/utility/include/jvm_android.h"
 #endif
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/main/include/audio_coding_module.h"
+#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/voice_engine/channel_proxy.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc {
 
 // Counter to be ensure that we can add a correct ID in all static trace
 // methods. It is not the nicest solution, especially not since we already
 // have a counter in VoEBaseImpl. In other words, there is room for
 // improvement here.
 static int32_t gVoiceEngineInstanceCounter = 0;
 
@@ skipping 40 matching lines @@
     // Example: AudioDeviceBuffer::RequestPlayoutData() can access a
     // partially deconstructed |_ptrCbAudioTransport| during destruction
     // if we don't call Terminate here.
     Terminate();
     delete this;
   }
 
   return new_ref;
 }
 
+voe::ChannelProxy* VoiceEngineImpl::GetChannelProxy(int channel_id) {
+  RTC_DCHECK(channel_id >= 0);
+  CriticalSectionScoped cs(crit_sec());
+  RTC_DCHECK(statistics().Initialized());
+  return new voe::ChannelProxy(channel_manager().GetChannel(channel_id));
+}

[kwiberg-webrtc, 2015/11/25 10:44:59]

I think this should return a scoped_ptr instead of a raw pointer, to make it
clear that it relinquishes ownership of the returned value. Also, all callers
that I can recall just ended up storing it in a scoped_ptr anyway.

[the sun, 2015/11/25 12:28:01]

Yes, that works great. Thanks.

+
 VoiceEngine* VoiceEngine::Create() {
   Config* config = new Config();
   return GetVoiceEngine(config, true);
 }
 
 VoiceEngine* VoiceEngine::Create(const Config& config) {
   return GetVoiceEngine(&config, false);
 }
 
 int VoiceEngine::SetTraceFilter(unsigned int filter) {
@@ skipping 57 matching lines @@
   webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM),
                           reinterpret_cast<jobject>(context));
   return 0;
 #else
   return -1;
 #endif
 }
 #endif
 
 }  // namespace webrtc