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

Enable clang::find_bad_constructs for sdk/android (part 1/2).

Browse Source 
This CL removes //build/config/clang:find_bad_constructs from the
suppressed_configs list, which means that clang:find_bad_constructs
is now enabled on these translation units.

Bug: webrtc:9251, webrtc:163, webrtc:9544
Change-Id: I7c211c4ac6b2e095e4c6594fce09fdb487bb1d9e
Reviewed-on: https://webrtc-review.googlesource.com/89600
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24056}
This commit is contained in:
Mirko Bonadei
2018-07-20 11:09:32 +02:00
committed by Commit Bot
parent 97ddbd7eba
commit 2ffed6d65c
23 changed files with 176 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/android/BUILD.gn
View File

@ -584,11 +584,6 @@ rtc_static_library("peerconnection_jni") {
"src/jni/pc/turncustomizer.h",
]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
":base_jni",
":generated_external_classes_jni",
@ -1256,11 +1251,6 @@ rtc_static_library("native_api_peerconnection") {
"native_api/peerconnection/peerconnectionfactory.h",
]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
":base_jni",
":peerconnection_jni",

2
sdk/android/src/jni/pc/datachannel.cc
View File

@ -29,7 +29,7 @@ namespace {
class DataChannelObserverJni : public DataChannelObserver {
public:
DataChannelObserverJni(JNIEnv* jni, const JavaRef<jobject>& j_observer);
virtual ~DataChannelObserverJni() {}
~DataChannelObserverJni() override {}
void OnBufferedAmountChange(uint64_t previous_amount) override;
void OnStateChange() override;

2
sdk/android/src/jni/pc/mediaconstraints.cc
View File

@ -44,7 +44,7 @@ class MediaConstraintsJni : public MediaConstraintsInterface {
optional_(PopulateConstraintsFromJavaPairList(
env,
Java_MediaConstraints_getOptional(env, j_constraints))) {}
virtual ~MediaConstraintsJni() = default;
~MediaConstraintsJni() override = default;
// MediaConstraintsInterface.
const Constraints& GetMandatory() const override { return mandatory_; }

2
sdk/android/src/jni/pc/mediastream.h
View File

@ -26,7 +26,7 @@ class JavaMediaStream : public sigslot::has_slots<> {
explicit JavaMediaStream(
JNIEnv* env,
rtc::scoped_refptr<MediaStreamInterface> media_stream);
~JavaMediaStream();
~JavaMediaStream() override;
const ScopedJavaGlobalRef<jobject>& j_media_stream() {
return j_media_stream_;

12
sdk/android/src/jni/pc/ownedfactoryandthreads.cc
View File

@ -20,6 +20,18 @@ PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) {
return reinterpret_cast<OwnedFactoryAndThreads*>(j_p)->factory();
}
OwnedFactoryAndThreads::OwnedFactoryAndThreads(
std::unique_ptr<Thread> network_thread,
std::unique_ptr<Thread> worker_thread,
std::unique_ptr<Thread> signaling_thread,
rtc::NetworkMonitorFactory* network_monitor_factory,
PeerConnectionFactoryInterface* factory)
: network_thread_(std::move(network_thread)),
worker_thread_(std::move(worker_thread)),
signaling_thread_(std::move(signaling_thread)),
network_monitor_factory_(network_monitor_factory),
factory_(factory) {}
OwnedFactoryAndThreads::~OwnedFactoryAndThreads() {
factory_->Release();
if (network_monitor_factory_ != nullptr) {

7
sdk/android/src/jni/pc/ownedfactoryandthreads.h
View File

@ -37,12 +37,7 @@ class OwnedFactoryAndThreads {
std::unique_ptr<Thread> worker_thread,
std::unique_ptr<Thread> signaling_thread,
rtc::NetworkMonitorFactory* network_monitor_factory,
PeerConnectionFactoryInterface* factory)
: network_thread_(std::move(network_thread)),
worker_thread_(std::move(worker_thread)),
signaling_thread_(std::move(signaling_thread)),
network_monitor_factory_(network_monitor_factory),
factory_(factory) {}
PeerConnectionFactoryInterface* factory);
~OwnedFactoryAndThreads();

7
sdk/android/src/jni/pc/peerconnection.cc
View File

@ -373,6 +373,13 @@ PeerConnectionObserverJni::NativeToJavaMediaStreamArray(
});
}
OwnedPeerConnection::OwnedPeerConnection(
rtc::scoped_refptr<PeerConnectionInterface> peer_connection,
std::unique_ptr<PeerConnectionObserver> observer)
: OwnedPeerConnection(peer_connection,
std::move(observer),
nullptr /* constraints */) {}
OwnedPeerConnection::OwnedPeerConnection(
rtc::scoped_refptr<PeerConnectionInterface> peer_connection,
std::unique_ptr<PeerConnectionObserver> observer,

7
sdk/android/src/jni/pc/peerconnection.h
View File

@ -40,7 +40,7 @@ rtc::KeyType GetRtcConfigKeyType(JNIEnv* env,
class PeerConnectionObserverJni : public PeerConnectionObserver {
public:
PeerConnectionObserverJni(JNIEnv* jni, const JavaRef<jobject>& j_observer);
virtual ~PeerConnectionObserverJni();
~PeerConnectionObserverJni() override;
// Implementation of PeerConnectionObserver interface, which propagates
// the callbacks to the Java observer.
@ -101,10 +101,7 @@ class OwnedPeerConnection {
public:
OwnedPeerConnection(
rtc::scoped_refptr<PeerConnectionInterface> peer_connection,
std::unique_ptr<PeerConnectionObserver> observer)
: OwnedPeerConnection(peer_connection,
std::move(observer),
nullptr /* constraints */) {}
std::unique_ptr<PeerConnectionObserver> observer);
// Deprecated. PC constraints are deprecated.
OwnedPeerConnection(
rtc::scoped_refptr<PeerConnectionInterface> peer_connection,

4
sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.cc
View File

@ -102,7 +102,7 @@ ScopedJavaLocalRef<jobject> MemberToJava(
ScopedJavaLocalRef<jobject> NativeToJavaRtcStats(JNIEnv* env,
const RTCStats& stats) {
JavaMapBuilder builder(env);
for (const auto& member : stats.Members()) {
for (auto* const member : stats.Members()) {
if (!member->is_defined())
continue;
builder.put(NativeToJavaString(env, member->name()),
@ -131,6 +131,8 @@ RTCStatsCollectorCallbackWrapper::RTCStatsCollectorCallbackWrapper(
const JavaRef<jobject>& j_callback)
: j_callback_global_(jni, j_callback) {}
RTCStatsCollectorCallbackWrapper::~RTCStatsCollectorCallbackWrapper() = default;
void RTCStatsCollectorCallbackWrapper::OnStatsDelivered(
const rtc::scoped_refptr<const RTCStatsReport>& report) {
JNIEnv* jni = AttachCurrentThreadIfNeeded();

1
sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h
View File

@ -26,6 +26,7 @@ class RTCStatsCollectorCallbackWrapper : public RTCStatsCollectorCallback {
public:
RTCStatsCollectorCallbackWrapper(JNIEnv* jni,
const JavaRef<jobject>& j_callback);
~RTCStatsCollectorCallbackWrapper() override;
void OnStatsDelivered(
const rtc::scoped_refptr<const RTCStatsReport>& report) override;

4
sdk/android/src/jni/pc/sdpobserver.cc
View File

@ -27,6 +27,8 @@ CreateSdpObserverJni::CreateSdpObserverJni(
: j_observer_global_(env, j_observer),
constraints_(std::move(constraints)) {}
CreateSdpObserverJni::~CreateSdpObserverJni() = default;
void CreateSdpObserverJni::OnSuccess(SessionDescriptionInterface* desc) {
JNIEnv* env = AttachCurrentThreadIfNeeded();
Java_SdpObserver_onCreateSuccess(env, j_observer_global_,
@ -49,6 +51,8 @@ SetSdpObserverJni::SetSdpObserverJni(
: j_observer_global_(env, j_observer),
constraints_(std::move(constraints)) {}
SetSdpObserverJni::~SetSdpObserverJni() = default;
void SetSdpObserverJni::OnSuccess() {
JNIEnv* env = AttachCurrentThreadIfNeeded();
Java_SdpObserver_onSetSuccess(env, j_observer_global_);

2
sdk/android/src/jni/pc/sdpobserver.h
View File

@ -26,6 +26,7 @@ class CreateSdpObserverJni : public CreateSessionDescriptionObserver {
CreateSdpObserverJni(JNIEnv* env,
const JavaRef<jobject>& j_observer,
std::unique_ptr<MediaConstraintsInterface> constraints);
~CreateSdpObserverJni() override;
MediaConstraintsInterface* constraints() { return constraints_.get(); }
@ -42,6 +43,7 @@ class SetSdpObserverJni : public SetSessionDescriptionObserver {
SetSdpObserverJni(JNIEnv* env,
const JavaRef<jobject>& j_observer,
std::unique_ptr<MediaConstraintsInterface> constraints);
~SetSdpObserverJni() override;
MediaConstraintsInterface* constraints() { return constraints_.get(); }

2
sdk/android/src/jni/pc/statsobserver.cc
View File

@ -58,6 +58,8 @@ StatsObserverJni::StatsObserverJni(JNIEnv* jni,
const JavaRef<jobject>& j_observer)
: j_observer_global_(jni, j_observer) {}
StatsObserverJni::~StatsObserverJni() = default;
void StatsObserverJni::OnComplete(const StatsReports& reports) {
JNIEnv* env = AttachCurrentThreadIfNeeded();
ScopedJavaLocalRef<jobjectArray> j_reports =

1
sdk/android/src/jni/pc/statsobserver.h
View File

@ -22,6 +22,7 @@ namespace jni {
class StatsObserverJni : public StatsObserver {
public:
StatsObserverJni(JNIEnv* jni, const JavaRef<jobject>& j_observer);
~StatsObserverJni() override;
void OnComplete(const StatsReports& reports) override;