Index: webrtc/sdk/android/src/jni/pc/rtpsender_jni.cc |
diff --git a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc b/webrtc/sdk/android/src/jni/pc/rtpsender_jni.cc |
similarity index 21% |
copy from webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc |
copy to webrtc/sdk/android/src/jni/pc/rtpsender_jni.cc |
index a3aa45c4bead267acec36c6862cae84a9790d792..36aad593cddf0b47b4e068dab66ecca6c1f14772 100644 |
--- a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc |
+++ b/webrtc/sdk/android/src/jni/pc/rtpsender_jni.cc |
@@ -8,57 +8,64 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-#include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h" |
- |
-#include "webrtc/rtc_base/logging.h" |
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h" |
+#include "webrtc/api/rtpsenderinterface.h" |
#include "webrtc/sdk/android/src/jni/jni_helpers.h" |
+#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h" |
namespace webrtc_jni { |
-PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) { |
- return reinterpret_cast<OwnedFactoryAndThreads*>(j_p)->factory(); |
+JOW(jboolean, RtpSender_nativeSetTrack) |
+(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer, jlong j_track_pointer) { |
+ return reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer) |
+ ->SetTrack(reinterpret_cast<webrtc::MediaStreamTrackInterface*>( |
+ j_track_pointer)); |
} |
-OwnedFactoryAndThreads::~OwnedFactoryAndThreads() { |
- CHECK_RELEASE(factory_); |
- if (network_monitor_factory_ != nullptr) { |
- rtc::NetworkMonitorFactory::ReleaseFactory(network_monitor_factory_); |
- } |
+JOW(jlong, RtpSender_nativeGetTrack) |
+(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) { |
+ return jlongFromPointer( |
+ reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer) |
+ ->track() |
+ .release()); |
} |
-void OwnedFactoryAndThreads::JavaCallbackOnFactoryThreads() { |
- JNIEnv* jni = AttachCurrentThreadIfNeeded(); |
- ScopedLocalRefFrame local_ref_frame(jni); |
- jclass j_factory_class = FindClass(jni, "org/webrtc/PeerConnectionFactory"); |
- jmethodID m = nullptr; |
- if (network_thread_->IsCurrent()) { |
- LOG(LS_INFO) << "Network thread JavaCallback"; |
- m = GetStaticMethodID(jni, j_factory_class, "onNetworkThreadReady", "()V"); |
- } |
- if (worker_thread_->IsCurrent()) { |
- LOG(LS_INFO) << "Worker thread JavaCallback"; |
- m = GetStaticMethodID(jni, j_factory_class, "onWorkerThreadReady", "()V"); |
- } |
- if (signaling_thread_->IsCurrent()) { |
- LOG(LS_INFO) << "Signaling thread JavaCallback"; |
- m = GetStaticMethodID(jni, j_factory_class, "onSignalingThreadReady", |
- "()V"); |
- } |
- if (m != nullptr) { |
- jni->CallStaticVoidMethod(j_factory_class, m); |
- CHECK_EXCEPTION(jni) << "error during JavaCallback::CallStaticVoidMethod"; |
+JOW(jlong, RtpSender_nativeGetDtmfSender) |
+(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) { |
+ return jlongFromPointer( |
+ reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer) |
+ ->GetDtmfSender() |
+ .release()); |
+} |
+ |
+JOW(jboolean, RtpSender_nativeSetParameters) |
+(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer, jobject j_parameters) { |
+ if (IsNull(jni, j_parameters)) { |
+ return false; |
} |
+ webrtc::RtpParameters parameters; |
+ JavaToNativeRtpParameters(jni, j_parameters, ¶meters); |
+ return reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer) |
+ ->SetParameters(parameters); |
+} |
+ |
+JOW(jobject, RtpSender_nativeGetParameters) |
+(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) { |
+ webrtc::RtpParameters parameters = |
+ reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer) |
+ ->GetParameters(); |
+ return NativeToJavaRtpParameters(jni, parameters); |
+} |
+ |
+JOW(jstring, RtpSender_nativeId) |
+(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) { |
+ return JavaStringFromStdString( |
+ jni, reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer) |
+ ->id()); |
} |
-void OwnedFactoryAndThreads::InvokeJavaCallbacksOnFactoryThreads() { |
- LOG(LS_INFO) << "InvokeJavaCallbacksOnFactoryThreads."; |
- network_thread_->Invoke<void>(RTC_FROM_HERE, |
- [this] { JavaCallbackOnFactoryThreads(); }); |
- worker_thread_->Invoke<void>(RTC_FROM_HERE, |
- [this] { JavaCallbackOnFactoryThreads(); }); |
- signaling_thread_->Invoke<void>(RTC_FROM_HERE, |
- [this] { JavaCallbackOnFactoryThreads(); }); |
+JOW(void, RtpSender_free)(JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) { |
+ reinterpret_cast<webrtc::RtpSenderInterface*>(j_rtp_sender_pointer) |
+ ->Release(); |
} |
} // namespace webrtc_jni |