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

Side by Side Diff: webrtc/sdk/android/src/jni/peerconnection_jni.cc

Issue 2903253004: Reland of Removes usage of native base::android::GetApplicationContext() (Closed)
Patch Set: Deprecated comment. Created 3 years, 6 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/sdk/android/api/org/webrtc/PeerConnectionFactory.java ('k') | webrtc/test/BUILD.gn » ('j') | 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 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2013 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
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 1132
1133 JOW(void, MediaStream_free)(JNIEnv*, jclass, jlong j_p) { 1133 JOW(void, MediaStream_free)(JNIEnv*, jclass, jlong j_p) {
1134 CHECK_RELEASE(reinterpret_cast<MediaStreamInterface*>(j_p)); 1134 CHECK_RELEASE(reinterpret_cast<MediaStreamInterface*>(j_p));
1135 } 1135 }
1136 1136
1137 JOW(jlong, PeerConnectionFactory_nativeCreateObserver)( 1137 JOW(jlong, PeerConnectionFactory_nativeCreateObserver)(
1138 JNIEnv * jni, jclass, jobject j_observer) { 1138 JNIEnv * jni, jclass, jobject j_observer) {
1139 return (jlong)new PCOJava(jni, j_observer); 1139 return (jlong)new PCOJava(jni, j_observer);
1140 } 1140 }
1141 1141
1142 JOW(void, PeerConnectionFactory_initializeAndroidGlobals) 1142 JOW(void, PeerConnectionFactory_nativeInitializeAndroidGlobals)
1143 (JNIEnv* jni, 1143 (JNIEnv* jni,
1144 jclass, 1144 jclass,
1145 jobject context, 1145 jobject context,
1146 jboolean video_hw_acceleration) { 1146 jboolean video_hw_acceleration) {
1147 video_hw_acceleration_enabled = video_hw_acceleration; 1147 video_hw_acceleration_enabled = video_hw_acceleration;
1148 AndroidNetworkMonitor::SetAndroidContext(jni, context); 1148 AndroidNetworkMonitor::SetAndroidContext(jni, context);
1149 if (!factory_static_initialized) { 1149 if (!factory_static_initialized) {
1150 RTC_DCHECK(j_application_context == nullptr); 1150 RTC_DCHECK(j_application_context == nullptr);
1151 j_application_context = NewGlobalRef(jni, context); 1151 j_application_context = NewGlobalRef(jni, context);
1152 webrtc::JVM::Initialize(GetJVM(), context); 1152 webrtc::JVM::Initialize(GetJVM());
1153 factory_static_initialized = true; 1153 factory_static_initialized = true;
1154 } 1154 }
1155 } 1155 }
1156 1156
1157 JOW(void, PeerConnectionFactory_initializeFieldTrials)( 1157 JOW(void, PeerConnectionFactory_initializeFieldTrials)(
1158 JNIEnv* jni, jclass, jstring j_trials_init_string) { 1158 JNIEnv* jni, jclass, jstring j_trials_init_string) {
1159 field_trials_init_string = NULL; 1159 field_trials_init_string = NULL;
1160 if (j_trials_init_string != NULL) { 1160 if (j_trials_init_string != NULL) {
1161 const char* init_string = 1161 const char* init_string =
1162 jni->GetStringUTFChars(j_trials_init_string, NULL); 1162 jni->GetStringUTFChars(j_trials_init_string, NULL);
(...skipping 1581 matching lines...) Expand 10 before | Expand all | Expand 10 after
2744 return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer) 2744 return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
2745 ->inter_tone_gap(); 2745 ->inter_tone_gap();
2746 } 2746 }
2747 2747
2748 JOW(void, DtmfSender_free) 2748 JOW(void, DtmfSender_free)
2749 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) { 2749 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
2750 reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)->Release(); 2750 reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)->Release();
2751 } 2751 }
2752 2752
2753 } // namespace webrtc_jni 2753 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java ('k') | webrtc/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698