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 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1093 } | 1093 } |
1094 if (m != nullptr) { | 1094 if (m != nullptr) { |
1095 jni->CallStaticVoidMethod(j_factory_class, m); | 1095 jni->CallStaticVoidMethod(j_factory_class, m); |
1096 CHECK_EXCEPTION(jni) << "error during JavaCallback::CallStaticVoidMethod"; | 1096 CHECK_EXCEPTION(jni) << "error during JavaCallback::CallStaticVoidMethod"; |
1097 } | 1097 } |
1098 } | 1098 } |
1099 | 1099 |
1100 void OwnedFactoryAndThreads::InvokeJavaCallbacksOnFactoryThreads() { | 1100 void OwnedFactoryAndThreads::InvokeJavaCallbacksOnFactoryThreads() { |
1101 LOG(LS_INFO) << "InvokeJavaCallbacksOnFactoryThreads."; | 1101 LOG(LS_INFO) << "InvokeJavaCallbacksOnFactoryThreads."; |
1102 worker_thread_->Invoke<void>( | 1102 worker_thread_->Invoke<void>( |
| 1103 FROM_HERE, |
1103 Bind(&OwnedFactoryAndThreads::JavaCallbackOnFactoryThreads, this)); | 1104 Bind(&OwnedFactoryAndThreads::JavaCallbackOnFactoryThreads, this)); |
1104 signaling_thread_->Invoke<void>( | 1105 signaling_thread_->Invoke<void>( |
| 1106 FROM_HERE, |
1105 Bind(&OwnedFactoryAndThreads::JavaCallbackOnFactoryThreads, this)); | 1107 Bind(&OwnedFactoryAndThreads::JavaCallbackOnFactoryThreads, this)); |
1106 } | 1108 } |
1107 | 1109 |
1108 PeerConnectionFactoryInterface::Options ParseOptionsFromJava(JNIEnv* jni, | 1110 PeerConnectionFactoryInterface::Options ParseOptionsFromJava(JNIEnv* jni, |
1109 jobject options) { | 1111 jobject options) { |
1110 jclass options_class = jni->GetObjectClass(options); | 1112 jclass options_class = jni->GetObjectClass(options); |
1111 jfieldID network_ignore_mask_field = | 1113 jfieldID network_ignore_mask_field = |
1112 jni->GetFieldID(options_class, "networkIgnoreMask", "I"); | 1114 jni->GetFieldID(options_class, "networkIgnoreMask", "I"); |
1113 int network_ignore_mask = | 1115 int network_ignore_mask = |
1114 jni->GetIntField(options, network_ignore_mask_field); | 1116 jni->GetIntField(options, network_ignore_mask_field); |
(...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2209 return JavaStringFromStdString( | 2211 return JavaStringFromStdString( |
2210 jni, | 2212 jni, |
2211 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); | 2213 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); |
2212 } | 2214 } |
2213 | 2215 |
2214 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { | 2216 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { |
2215 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); | 2217 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); |
2216 } | 2218 } |
2217 | 2219 |
2218 } // namespace webrtc_jni | 2220 } // namespace webrtc_jni |
OLD | NEW |