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

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

Issue 3009613002: Android: Replace webrtc_jni namespace with nested jni namespace (Closed)
Patch Set: Rebase Created 3 years, 3 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/pc/ownedfactoryandthreads.h" 11 #include "webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h"
12 12
13 #include "webrtc/rtc_base/logging.h" 13 #include "webrtc/rtc_base/logging.h"
14 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 14 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
15 #include "webrtc/sdk/android/src/jni/jni_helpers.h" 15 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
16 16
17 namespace webrtc_jni { 17 namespace webrtc {
18 namespace jni {
18 19
19 PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) { 20 PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) {
20 return reinterpret_cast<OwnedFactoryAndThreads*>(j_p)->factory(); 21 return reinterpret_cast<OwnedFactoryAndThreads*>(j_p)->factory();
21 } 22 }
22 23
23 OwnedFactoryAndThreads::~OwnedFactoryAndThreads() { 24 OwnedFactoryAndThreads::~OwnedFactoryAndThreads() {
24 CHECK_RELEASE(factory_); 25 CHECK_RELEASE(factory_);
25 if (network_monitor_factory_ != nullptr) { 26 if (network_monitor_factory_ != nullptr) {
26 rtc::NetworkMonitorFactory::ReleaseFactory(network_monitor_factory_); 27 rtc::NetworkMonitorFactory::ReleaseFactory(network_monitor_factory_);
27 } 28 }
(...skipping 26 matching lines...) Expand all
54 void OwnedFactoryAndThreads::InvokeJavaCallbacksOnFactoryThreads() { 55 void OwnedFactoryAndThreads::InvokeJavaCallbacksOnFactoryThreads() {
55 LOG(LS_INFO) << "InvokeJavaCallbacksOnFactoryThreads."; 56 LOG(LS_INFO) << "InvokeJavaCallbacksOnFactoryThreads.";
56 network_thread_->Invoke<void>(RTC_FROM_HERE, 57 network_thread_->Invoke<void>(RTC_FROM_HERE,
57 [this] { JavaCallbackOnFactoryThreads(); }); 58 [this] { JavaCallbackOnFactoryThreads(); });
58 worker_thread_->Invoke<void>(RTC_FROM_HERE, 59 worker_thread_->Invoke<void>(RTC_FROM_HERE,
59 [this] { JavaCallbackOnFactoryThreads(); }); 60 [this] { JavaCallbackOnFactoryThreads(); });
60 signaling_thread_->Invoke<void>(RTC_FROM_HERE, 61 signaling_thread_->Invoke<void>(RTC_FROM_HERE,
61 [this] { JavaCallbackOnFactoryThreads(); }); 62 [this] { JavaCallbackOnFactoryThreads(); });
62 } 63 }
63 64
64 } // namespace webrtc_jni 65 } // namespace jni
66 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h ('k') | webrtc/sdk/android/src/jni/pc/peerconnection_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698