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

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

Issue 2800353002: Removing unnecessary parameters from initializeAndroidGlobals. (Closed)
Patch Set: Change type of "context" to an actual Android context. Created 3 years, 8 months 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/include/voe_base.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"
16 #endif 15 #endif
17 16
18 #include "webrtc/base/checks.h" 17 #include "webrtc/base/checks.h"
19 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 18 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
20 #include "webrtc/system_wrappers/include/trace.h" 19 #include "webrtc/system_wrappers/include/trace.h"
21 #include "webrtc/voice_engine/channel_proxy.h" 20 #include "webrtc/voice_engine/channel_proxy.h"
22 #include "webrtc/voice_engine/voice_engine_impl.h" 21 #include "webrtc/voice_engine/voice_engine_impl.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 24
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 WEBRTC_TRACE( 121 WEBRTC_TRACE(
123 kTraceWarning, kTraceVoice, -1, 122 kTraceWarning, kTraceVoice, -1,
124 "VoiceEngine::Delete did not release the very last reference. " 123 "VoiceEngine::Delete did not release the very last reference. "
125 "%d references remain.", 124 "%d references remain.",
126 ref); 125 ref);
127 } 126 }
128 127
129 return true; 128 return true;
130 } 129 }
131 130
132 #if !defined(WEBRTC_CHROMIUM_BUILD)
133 // TODO(henrika): change types to JavaVM* and jobject instead of void*.
134 int VoiceEngine::SetAndroidObjects(void* javaVM, void* context) {
135 #ifdef WEBRTC_ANDROID
136 webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM),
137 reinterpret_cast<jobject>(context));
138 return 0;
139 #else
140 return -1;
141 #endif
142 }
143 #endif
144
145 std::string VoiceEngine::GetVersionString() { 131 std::string VoiceEngine::GetVersionString() {
146 std::string version = "VoiceEngine 4.1.0"; 132 std::string version = "VoiceEngine 4.1.0";
147 #ifdef WEBRTC_EXTERNAL_TRANSPORT 133 #ifdef WEBRTC_EXTERNAL_TRANSPORT
148 version += " (External transport build)"; 134 version += " (External transport build)";
149 #endif 135 #endif
150 return version; 136 return version;
151 } 137 }
152 138
153 } // namespace webrtc 139 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/include/voe_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698