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

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

Issue 2992103002: Relanding: Break peerconnection_jni.cc into multiple files, in "pc" directory. (Closed)
Patch Set: Add jni/androidnetworkmonitor_jni.h include for backwards comaptibility. Created 3 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 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 #include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h" 11 #include "webrtc/api/rtpreceiverinterface.h"
12
13 #include "webrtc/rtc_base/logging.h"
14 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
15 #include "webrtc/sdk/android/src/jni/jni_helpers.h" 12 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
13 #include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h"
14 #include "webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h"
16 15
17 namespace webrtc_jni { 16 namespace webrtc_jni {
18 17
19 PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) { 18 JOW(jlong, RtpReceiver_nativeGetTrack)
20 return reinterpret_cast<OwnedFactoryAndThreads*>(j_p)->factory(); 19 (JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer, jlong j_track_pointer) {
20 return jlongFromPointer(
21 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
22 ->track()
23 .release());
21 } 24 }
22 25
23 OwnedFactoryAndThreads::~OwnedFactoryAndThreads() { 26 JOW(jboolean, RtpReceiver_nativeSetParameters)
24 CHECK_RELEASE(factory_); 27 (JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer, jobject j_parameters) {
25 if (network_monitor_factory_ != nullptr) { 28 if (IsNull(jni, j_parameters)) {
26 rtc::NetworkMonitorFactory::ReleaseFactory(network_monitor_factory_); 29 return false;
30 }
31 webrtc::RtpParameters parameters;
32 JavaToNativeRtpParameters(jni, j_parameters, &parameters);
33 return reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
34 ->SetParameters(parameters);
35 }
36
37 JOW(jobject, RtpReceiver_nativeGetParameters)
38 (JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
39 webrtc::RtpParameters parameters =
40 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
41 ->GetParameters();
42 return NativeToJavaRtpParameters(jni, parameters);
43 }
44
45 JOW(jstring, RtpReceiver_nativeId)
46 (JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
47 return JavaStringFromStdString(
48 jni,
49 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
50 ->id());
51 }
52
53 JOW(void, RtpReceiver_free)
54 (JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
55 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
56 ->Release();
57 }
58
59 JOW(jlong, RtpReceiver_nativeSetObserver)
60 (JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer, jobject j_observer) {
61 RtpReceiverObserverJni* rtpReceiverObserver =
62 new RtpReceiverObserverJni(jni, j_observer);
63 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
64 ->SetObserver(rtpReceiverObserver);
65 return jlongFromPointer(rtpReceiverObserver);
66 }
67
68 JOW(void, RtpReceiver_nativeUnsetObserver)
69 (JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer, jlong j_observer_pointer) {
70 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
71 ->SetObserver(nullptr);
72 RtpReceiverObserverJni* observer =
73 reinterpret_cast<RtpReceiverObserverJni*>(j_observer_pointer);
74 if (observer) {
75 delete observer;
27 } 76 }
28 } 77 }
29 78
30 void OwnedFactoryAndThreads::JavaCallbackOnFactoryThreads() {
31 JNIEnv* jni = AttachCurrentThreadIfNeeded();
32 ScopedLocalRefFrame local_ref_frame(jni);
33 jclass j_factory_class = FindClass(jni, "org/webrtc/PeerConnectionFactory");
34 jmethodID m = nullptr;
35 if (network_thread_->IsCurrent()) {
36 LOG(LS_INFO) << "Network thread JavaCallback";
37 m = GetStaticMethodID(jni, j_factory_class, "onNetworkThreadReady", "()V");
38 }
39 if (worker_thread_->IsCurrent()) {
40 LOG(LS_INFO) << "Worker thread JavaCallback";
41 m = GetStaticMethodID(jni, j_factory_class, "onWorkerThreadReady", "()V");
42 }
43 if (signaling_thread_->IsCurrent()) {
44 LOG(LS_INFO) << "Signaling thread JavaCallback";
45 m = GetStaticMethodID(jni, j_factory_class, "onSignalingThreadReady",
46 "()V");
47 }
48 if (m != nullptr) {
49 jni->CallStaticVoidMethod(j_factory_class, m);
50 CHECK_EXCEPTION(jni) << "error during JavaCallback::CallStaticVoidMethod";
51 }
52 }
53
54 void OwnedFactoryAndThreads::InvokeJavaCallbacksOnFactoryThreads() {
55 LOG(LS_INFO) << "InvokeJavaCallbacksOnFactoryThreads.";
56 network_thread_->Invoke<void>(RTC_FROM_HERE,
57 [this] { JavaCallbackOnFactoryThreads(); });
58 worker_thread_->Invoke<void>(RTC_FROM_HERE,
59 [this] { JavaCallbackOnFactoryThreads(); });
60 signaling_thread_->Invoke<void>(RTC_FROM_HERE,
61 [this] { JavaCallbackOnFactoryThreads(); });
62 }
63
64 } // namespace webrtc_jni 79 } // namespace webrtc_jni
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698