OLD | NEW |
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 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1112 jni, j_factory_class, "onSignalingThreadReady", "()V"); | 1112 jni, j_factory_class, "onSignalingThreadReady", "()V"); |
1113 } | 1113 } |
1114 if (m != nullptr) { | 1114 if (m != nullptr) { |
1115 jni->CallStaticVoidMethod(j_factory_class, m); | 1115 jni->CallStaticVoidMethod(j_factory_class, m); |
1116 CHECK_EXCEPTION(jni) << "error during JavaCallback::CallStaticVoidMethod"; | 1116 CHECK_EXCEPTION(jni) << "error during JavaCallback::CallStaticVoidMethod"; |
1117 } | 1117 } |
1118 } | 1118 } |
1119 | 1119 |
1120 void OwnedFactoryAndThreads::InvokeJavaCallbacksOnFactoryThreads() { | 1120 void OwnedFactoryAndThreads::InvokeJavaCallbacksOnFactoryThreads() { |
1121 LOG(LS_INFO) << "InvokeJavaCallbacksOnFactoryThreads."; | 1121 LOG(LS_INFO) << "InvokeJavaCallbacksOnFactoryThreads."; |
1122 network_thread_->Invoke<void>([this] { JavaCallbackOnFactoryThreads(); }); | 1122 network_thread_->Invoke<void>(RTC_FROM_HERE, |
1123 worker_thread_->Invoke<void>([this] { JavaCallbackOnFactoryThreads(); }); | 1123 [this] { JavaCallbackOnFactoryThreads(); }); |
1124 signaling_thread_->Invoke<void>([this] { JavaCallbackOnFactoryThreads(); }); | 1124 worker_thread_->Invoke<void>(RTC_FROM_HERE, |
| 1125 [this] { JavaCallbackOnFactoryThreads(); }); |
| 1126 signaling_thread_->Invoke<void>(RTC_FROM_HERE, |
| 1127 [this] { JavaCallbackOnFactoryThreads(); }); |
1125 } | 1128 } |
1126 | 1129 |
1127 PeerConnectionFactoryInterface::Options ParseOptionsFromJava(JNIEnv* jni, | 1130 PeerConnectionFactoryInterface::Options ParseOptionsFromJava(JNIEnv* jni, |
1128 jobject options) { | 1131 jobject options) { |
1129 jclass options_class = jni->GetObjectClass(options); | 1132 jclass options_class = jni->GetObjectClass(options); |
1130 jfieldID network_ignore_mask_field = | 1133 jfieldID network_ignore_mask_field = |
1131 jni->GetFieldID(options_class, "networkIgnoreMask", "I"); | 1134 jni->GetFieldID(options_class, "networkIgnoreMask", "I"); |
1132 int network_ignore_mask = | 1135 int network_ignore_mask = |
1133 jni->GetIntField(options, network_ignore_mask_field); | 1136 jni->GetIntField(options, network_ignore_mask_field); |
1134 | 1137 |
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2285 return JavaStringFromStdString( | 2288 return JavaStringFromStdString( |
2286 jni, | 2289 jni, |
2287 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); | 2290 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); |
2288 } | 2291 } |
2289 | 2292 |
2290 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { | 2293 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { |
2291 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); | 2294 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); |
2292 } | 2295 } |
2293 | 2296 |
2294 } // namespace webrtc_jni | 2297 } // namespace webrtc_jni |
OLD | NEW |