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

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

Issue 1459083007: Open backdoor in VoiceEngineImpl to get at the actual voe::Channel objects from an ID. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: presubmit complaints Created 5 years 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/voice_engine/voice_engine_impl.h ('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
11 #if defined(WEBRTC_ANDROID) 11 #if defined(WEBRTC_ANDROID)
12 #include "webrtc/modules/audio_device/android/audio_device_template.h" 12 #include "webrtc/modules/audio_device/android/audio_device_template.h"
13 #include "webrtc/modules/audio_device/android/audio_record_jni.h" 13 #include "webrtc/modules/audio_device/android/audio_record_jni.h"
14 #include "webrtc/modules/audio_device/android/audio_track_jni.h" 14 #include "webrtc/modules/audio_device/android/audio_track_jni.h"
15 #include "webrtc/modules/utility/include/jvm_android.h" 15 #include "webrtc/modules/utility/include/jvm_android.h"
16 #endif 16 #endif
17 17
18 #include "webrtc/base/checks.h"
18 #include "webrtc/modules/audio_coding/main/include/audio_coding_module.h" 19 #include "webrtc/modules/audio_coding/main/include/audio_coding_module.h"
20 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
19 #include "webrtc/system_wrappers/include/trace.h" 21 #include "webrtc/system_wrappers/include/trace.h"
22 #include "webrtc/voice_engine/channel_proxy.h"
20 #include "webrtc/voice_engine/voice_engine_impl.h" 23 #include "webrtc/voice_engine/voice_engine_impl.h"
21 24
22 namespace webrtc { 25 namespace webrtc {
23 26
24 // Counter to be ensure that we can add a correct ID in all static trace 27 // Counter to be ensure that we can add a correct ID in all static trace
25 // methods. It is not the nicest solution, especially not since we already 28 // methods. It is not the nicest solution, especially not since we already
26 // have a counter in VoEBaseImpl. In other words, there is room for 29 // have a counter in VoEBaseImpl. In other words, there is room for
27 // improvement here. 30 // improvement here.
28 static int32_t gVoiceEngineInstanceCounter = 0; 31 static int32_t gVoiceEngineInstanceCounter = 0;
29 32
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 // Example: AudioDeviceBuffer::RequestPlayoutData() can access a 73 // Example: AudioDeviceBuffer::RequestPlayoutData() can access a
71 // partially deconstructed |_ptrCbAudioTransport| during destruction 74 // partially deconstructed |_ptrCbAudioTransport| during destruction
72 // if we don't call Terminate here. 75 // if we don't call Terminate here.
73 Terminate(); 76 Terminate();
74 delete this; 77 delete this;
75 } 78 }
76 79
77 return new_ref; 80 return new_ref;
78 } 81 }
79 82
83 rtc::scoped_ptr<voe::ChannelProxy> VoiceEngineImpl::GetChannelProxy(
84 int channel_id) {
85 RTC_DCHECK(channel_id >= 0);
86 CriticalSectionScoped cs(crit_sec());
87 RTC_DCHECK(statistics().Initialized());
88 return rtc::scoped_ptr<voe::ChannelProxy>(
89 new voe::ChannelProxy(channel_manager().GetChannel(channel_id)));
90 }
91
80 VoiceEngine* VoiceEngine::Create() { 92 VoiceEngine* VoiceEngine::Create() {
81 Config* config = new Config(); 93 Config* config = new Config();
82 return GetVoiceEngine(config, true); 94 return GetVoiceEngine(config, true);
83 } 95 }
84 96
85 VoiceEngine* VoiceEngine::Create(const Config& config) { 97 VoiceEngine* VoiceEngine::Create(const Config& config) {
86 return GetVoiceEngine(&config, false); 98 return GetVoiceEngine(&config, false);
87 } 99 }
88 100
89 int VoiceEngine::SetTraceFilter(unsigned int filter) { 101 int VoiceEngine::SetTraceFilter(unsigned int filter) {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM), 159 webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM),
148 reinterpret_cast<jobject>(context)); 160 reinterpret_cast<jobject>(context));
149 return 0; 161 return 0;
150 #else 162 #else
151 return -1; 163 return -1;
152 #endif 164 #endif
153 } 165 }
154 #endif 166 #endif
155 167
156 } // namespace webrtc 168 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voice_engine_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698