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

Unified Diff: webrtc/sdk/android/src/jni/ownedfactoryandthreads.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/sdk/android/src/jni/ownedfactoryandthreads.h ('k') | webrtc/sdk/android/src/jni/pc/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
diff --git a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
deleted file mode 100644
index a3aa45c4bead267acec36c6862cae84a9790d792..0000000000000000000000000000000000000000
--- a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2017 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * 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/sdk/android/src/jni/jni_helpers.h"
-
-namespace webrtc_jni {
-
-PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) {
- return reinterpret_cast<OwnedFactoryAndThreads*>(j_p)->factory();
-}
-
-OwnedFactoryAndThreads::~OwnedFactoryAndThreads() {
- CHECK_RELEASE(factory_);
- if (network_monitor_factory_ != nullptr) {
- rtc::NetworkMonitorFactory::ReleaseFactory(network_monitor_factory_);
- }
-}
-
-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";
- }
-}
-
-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(); });
-}
-
-} // namespace webrtc_jni
« no previous file with comments | « webrtc/sdk/android/src/jni/ownedfactoryandthreads.h ('k') | webrtc/sdk/android/src/jni/pc/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698