Relanding: Break peerconnection_jni.cc into multiple files, in "pc" directory.

webrtc/sdk/android/src/jni/pc/rtpreceiver_jni.cc

Index: webrtc/sdk/android/src/jni/pc/rtpreceiver_jni.cc
diff --git a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc b/webrtc/sdk/android/src/jni/pc/rtpreceiver_jni.cc
similarity index 18%
copy from webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
copy to webrtc/sdk/android/src/jni/pc/rtpreceiver_jni.cc
index a3aa45c4bead267acec36c6862cae84a9790d792..26148a8e20746ba5bf75e53401428ec5e65f8436 100644
--- a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
+++ b/webrtc/sdk/android/src/jni/pc/rtpreceiver_jni.cc
@@ -8,57 +8,72 @@
  *  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/rtpreceiverinterface.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
+#include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h"
+#include "webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h"
 
 namespace webrtc_jni {
 
-PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) {
-  return reinterpret_cast<OwnedFactoryAndThreads*>(j_p)->factory();
+JOW(jlong, RtpReceiver_nativeGetTrack)
+(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer, jlong j_track_pointer) {
+  return jlongFromPointer(
+      reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
+          ->track()
+          .release());
 }
 
-OwnedFactoryAndThreads::~OwnedFactoryAndThreads() {
-  CHECK_RELEASE(factory_);
-  if (network_monitor_factory_ != nullptr) {
-    rtc::NetworkMonitorFactory::ReleaseFactory(network_monitor_factory_);
+JOW(jboolean, RtpReceiver_nativeSetParameters)
+(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer, jobject j_parameters) {
+  if (IsNull(jni, j_parameters)) {
+    return false;
   }
+  webrtc::RtpParameters parameters;
+  JavaToNativeRtpParameters(jni, j_parameters, &parameters);
+  return reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
+      ->SetParameters(parameters);
 }
 
-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(jobject, RtpReceiver_nativeGetParameters)
+(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
+  webrtc::RtpParameters parameters =
+      reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
+          ->GetParameters();
+  return NativeToJavaRtpParameters(jni, parameters);
+}
+
+JOW(jstring, RtpReceiver_nativeId)
+(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
+  return JavaStringFromStdString(
+      jni,
+      reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
+          ->id());
+}
+
+JOW(void, RtpReceiver_free)
+(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
+  reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
+      ->Release();
 }
 
-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(jlong, RtpReceiver_nativeSetObserver)
+(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer, jobject j_observer) {
+  RtpReceiverObserverJni* rtpReceiverObserver =
+      new RtpReceiverObserverJni(jni, j_observer);
+  reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
+      ->SetObserver(rtpReceiverObserver);
+  return jlongFromPointer(rtpReceiverObserver);
+}
+
+JOW(void, RtpReceiver_nativeUnsetObserver)
+(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer, jlong j_observer_pointer) {
+  reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer)
+      ->SetObserver(nullptr);
+  RtpReceiverObserverJni* observer =
+      reinterpret_cast<RtpReceiverObserverJni*>(j_observer_pointer);
+  if (observer) {
+    delete observer;
+  }
 }
 
 }  // namespace webrtc_jni