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

Side by Side Diff: webrtc/sdk/android/src/jni/pc/rtpsender_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/rtpsenderinterface.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"
16 14
17 namespace webrtc_jni { 15 namespace webrtc_jni {
18 16
19 PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) { 17 JOW(jboolean, RtpSender_nativeSetTrack)
20 return reinterpret_cast<OwnedFactoryAndThreads*>(j_p)->factory(); 18 (JNIEnv* jni, jclass, jlong j_rtp_sender_pointer, jlong j_track_pointer) {
19 return reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer)
20 ->SetTrack(reinterpret_cast<webrtc::MediaStreamTrackInterface*>(
21 j_track_pointer));
21 } 22 }
22 23
23 OwnedFactoryAndThreads::~OwnedFactoryAndThreads() { 24 JOW(jlong, RtpSender_nativeGetTrack)
24 CHECK_RELEASE(factory_); 25 (JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) {
25 if (network_monitor_factory_ != nullptr) { 26 return jlongFromPointer(
26 rtc::NetworkMonitorFactory::ReleaseFactory(network_monitor_factory_); 27 reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer)
27 } 28 ->track()
29 .release());
28 } 30 }
29 31
30 void OwnedFactoryAndThreads::JavaCallbackOnFactoryThreads() { 32 JOW(jlong, RtpSender_nativeGetDtmfSender)
31 JNIEnv* jni = AttachCurrentThreadIfNeeded(); 33 (JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) {
32 ScopedLocalRefFrame local_ref_frame(jni); 34 return jlongFromPointer(
33 jclass j_factory_class = FindClass(jni, "org/webrtc/PeerConnectionFactory"); 35 reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer)
34 jmethodID m = nullptr; 36 ->GetDtmfSender()
35 if (network_thread_->IsCurrent()) { 37 .release());
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 } 38 }
53 39
54 void OwnedFactoryAndThreads::InvokeJavaCallbacksOnFactoryThreads() { 40 JOW(jboolean, RtpSender_nativeSetParameters)
55 LOG(LS_INFO) << "InvokeJavaCallbacksOnFactoryThreads."; 41 (JNIEnv* jni, jclass, jlong j_rtp_sender_pointer, jobject j_parameters) {
56 network_thread_->Invoke<void>(RTC_FROM_HERE, 42 if (IsNull(jni, j_parameters)) {
57 [this] { JavaCallbackOnFactoryThreads(); }); 43 return false;
58 worker_thread_->Invoke<void>(RTC_FROM_HERE, 44 }
59 [this] { JavaCallbackOnFactoryThreads(); }); 45 webrtc::RtpParameters parameters;
60 signaling_thread_->Invoke<void>(RTC_FROM_HERE, 46 JavaToNativeRtpParameters(jni, j_parameters, &parameters);
61 [this] { JavaCallbackOnFactoryThreads(); }); 47 return reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer)
48 ->SetParameters(parameters);
49 }
50
51 JOW(jobject, RtpSender_nativeGetParameters)
52 (JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) {
53 webrtc::RtpParameters parameters =
54 reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer)
55 ->GetParameters();
56 return NativeToJavaRtpParameters(jni, parameters);
57 }
58
59 JOW(jstring, RtpSender_nativeId)
60 (JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) {
61 return JavaStringFromStdString(
62 jni, reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer)
63 ->id());
64 }
65
66 JOW(void, RtpSender_free)(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) {
67 reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer)
68 ->Release();
62 } 69 }
63 70
64 } // namespace webrtc_jni 71 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.cc ('k') | webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698