zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update android jni code to use C++ lambdas instead of rtc::Bind

Browse Source 
Bug: webrtc:11339
Change-Id: I269bde1933d3f1d7b83b561eb2a09d0f38245e50
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/201735
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32991}
This commit is contained in:
Niels Möller
2021-01-14 16:46:25 +01:00
committed by Commit Bot
parent d76dcbd963
commit b45d3aa30e
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sdk/android/src/jni/android_network_monitor.cc
View File

@ -16,7 +16,6 @@
#define RTLD_NOLOAD 4 #define RTLD_NOLOAD 4
#endif #endif
#include "rtc_base/bind.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/ip_address.h" #include "rtc_base/ip_address.h"
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
@ -548,19 +547,18 @@ void AndroidNetworkMonitor::NotifyOfNetworkConnect(
const JavaRef<jobject>& j_network_info) { const JavaRef<jobject>& j_network_info) {
NetworkInformation network_info = NetworkInformation network_info =
GetNetworkInformationFromJava(env, j_network_info); GetNetworkInformationFromJava(env, j_network_info);
network_thread_->Invoke<void>( network_thread_->Invoke<void>(RTC_FROM_HERE, [this, &network_info] {
RTC_FROM_HERE, rtc::Bind(&AndroidNetworkMonitor::OnNetworkConnected_n, OnNetworkConnected_n(network_info);
this, network_info)); });
} }
void AndroidNetworkMonitor::NotifyOfNetworkDisconnect( void AndroidNetworkMonitor::NotifyOfNetworkDisconnect(
JNIEnv* env, JNIEnv* env,
const JavaRef<jobject>& j_caller, const JavaRef<jobject>& j_caller,
jlong network_handle) { jlong network_handle) {
network_thread_->Invoke<void>( network_thread_->Invoke<void>(RTC_FROM_HERE, [this, network_handle] {
RTC_FROM_HERE, OnNetworkDisconnected_n(static_cast<NetworkHandle>(network_handle));
rtc::Bind(&AndroidNetworkMonitor::OnNetworkDisconnected_n, this, });
static_cast<NetworkHandle>(network_handle)));
} }
void AndroidNetworkMonitor::NotifyOfNetworkPreference( void AndroidNetworkMonitor::NotifyOfNetworkPreference(
@ -572,9 +570,9 @@ void AndroidNetworkMonitor::NotifyOfNetworkPreference(
rtc::NetworkPreference preference = rtc::NetworkPreference preference =
static_cast<rtc::NetworkPreference>(jpreference); static_cast<rtc::NetworkPreference>(jpreference);
network_thread_->Invoke<void>( network_thread_->Invoke<void>(RTC_FROM_HERE, [this, type, preference] {
RTC_FROM_HERE, rtc::Bind(&AndroidNetworkMonitor::OnNetworkPreference_n, OnNetworkPreference_n(type, preference);
this, type, preference)); });
} }
} // namespace jni } // namespace jni

8
sdk/android/src/jni/android_video_track_source.cc
View File

@ -14,7 +14,6 @@
#include <utility> #include <utility>
#include "rtc_base/bind.h"
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
namespace webrtc { namespace webrtc {
@ -68,12 +67,7 @@ void AndroidVideoTrackSource::SetState(JNIEnv* env,
} else { } else {
// TODO(sakal): Is this even necessary, does FireOnChanged have to be // TODO(sakal): Is this even necessary, does FireOnChanged have to be
// called from signaling thread? // called from signaling thread?
signaling_thread_->PostTask( signaling_thread_->PostTask(RTC_FROM_HERE, [this] { FireOnChanged(); });
RTC_FROM_HERE,
rtc::Bind(
&AndroidVideoTrackSource::FireOnChanged,
static_cast<webrtc::Notifier<webrtc::VideoTrackSourceInterface>*>(
this)));
} }
} }
} }