Remove chromium clang style errors affecting sdk/android/media_jni
Bug: webrtc:163
Change-Id: I1e98174817ca032ee13f9a6a386803382843389d
Reviewed-on: https://webrtc-review.googlesource.com/67360
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Paulina Hensman <phensman@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22796}diff --git a/media/base/mediachannel.cc b/media/base/mediachannel.cc
new file mode 100644
index 0000000..019739d
--- /dev/null
+++ b/media/base/mediachannel.cc
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2018 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 "media/base/mediachannel.h"
+
+namespace cricket {
+
+VideoOptions::VideoOptions() = default;
+VideoOptions::~VideoOptions() = default;
+
+void MediaChannel::SetInterface(NetworkInterface* iface) {
+ rtc::CritScope cs(&network_interface_crit_);
+ network_interface_ = iface;
+ SetDscp(enable_dscp_ ? PreferredDscp() : rtc::DSCP_DEFAULT);
+}
+
+rtc::DiffServCodePoint MediaChannel::PreferredDscp() const {
+ return rtc::DSCP_DEFAULT;
+}
+
+int MediaChannel::GetRtpSendTimeExtnId() const {
+ return -1;
+}
+
+MediaSenderInfo::MediaSenderInfo() = default;
+MediaSenderInfo::~MediaSenderInfo() = default;
+
+MediaReceiverInfo::MediaReceiverInfo() = default;
+MediaReceiverInfo::~MediaReceiverInfo() = default;
+
+VoiceSenderInfo::VoiceSenderInfo() = default;
+VoiceSenderInfo::~VoiceSenderInfo() = default;
+
+VoiceReceiverInfo::VoiceReceiverInfo() = default;
+VoiceReceiverInfo::~VoiceReceiverInfo() = default;
+
+VideoSenderInfo::VideoSenderInfo() = default;
+VideoSenderInfo::~VideoSenderInfo() = default;
+
+VideoReceiverInfo::VideoReceiverInfo() = default;
+VideoReceiverInfo::~VideoReceiverInfo() = default;
+
+VoiceMediaInfo::VoiceMediaInfo() = default;
+VoiceMediaInfo::~VoiceMediaInfo() = default;
+
+VideoMediaInfo::VideoMediaInfo() = default;
+VideoMediaInfo::~VideoMediaInfo() = default;
+
+DataMediaInfo::DataMediaInfo() = default;
+DataMediaInfo::~DataMediaInfo() = default;
+
+AudioSendParameters::AudioSendParameters() = default;
+AudioSendParameters::~AudioSendParameters() = default;
+
+std::map<std::string, std::string> AudioSendParameters::ToStringMap() const {
+ auto params = RtpSendParameters<AudioCodec>::ToStringMap();
+ params["options"] = options.ToString();
+ return params;
+}
+
+VideoSendParameters::VideoSendParameters() = default;
+VideoSendParameters::~VideoSendParameters() = default;
+
+std::map<std::string, std::string> VideoSendParameters::ToStringMap() const {
+ auto params = RtpSendParameters<VideoCodec>::ToStringMap();
+ params["conference_mode"] = (conference_mode ? "yes" : "no");
+ return params;
+}
+
+DataMediaChannel::DataMediaChannel() = default;
+DataMediaChannel::DataMediaChannel(const MediaConfig& config)
+ : MediaChannel(config) {}
+DataMediaChannel::~DataMediaChannel() = default;
+
+bool DataMediaChannel::GetStats(DataMediaInfo* info) {
+ return true;
+}
+
+} // namespace cricket
diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h
index 7695079..57cbb3e 100644
--- a/media/base/mediachannel.h
+++ b/media/base/mediachannel.h
@@ -94,6 +94,9 @@
// We are moving all of the setting of options to structs like this,
// but some things currently still use flags.
struct VideoOptions {
+ VideoOptions();
+ ~VideoOptions();
+
void SetAll(const VideoOptions& change) {
SetFrom(&video_noise_reduction, change.video_noise_reduction);
SetFrom(&screencast_min_bitrate_kbps, change.screencast_min_bitrate_kbps);
@@ -176,17 +179,11 @@
explicit MediaChannel(const MediaConfig& config)
: enable_dscp_(config.enable_dscp), network_interface_(NULL) {}
MediaChannel() : enable_dscp_(false), network_interface_(NULL) {}
- virtual ~MediaChannel() {}
+ ~MediaChannel() override {}
// Sets the abstract interface class for sending RTP/RTCP data.
- virtual void SetInterface(NetworkInterface *iface) {
- rtc::CritScope cs(&network_interface_crit_);
- network_interface_ = iface;
- SetDscp(enable_dscp_ ? PreferredDscp() : rtc::DSCP_DEFAULT);
- }
- virtual rtc::DiffServCodePoint PreferredDscp() const {
- return rtc::DSCP_DEFAULT;
- }
+ virtual void SetInterface(NetworkInterface* iface);
+ virtual rtc::DiffServCodePoint PreferredDscp() const;
// Called when a RTP packet is received.
virtual void OnPacketReceived(rtc::CopyOnWriteBuffer* packet,
const rtc::PacketTime& packet_time) = 0;
@@ -217,9 +214,7 @@
virtual bool RemoveRecvStream(uint32_t ssrc) = 0;
// Returns the absoulte sendtime extension id value from media channel.
- virtual int GetRtpSendTimeExtnId() const {
- return -1;
- }
+ virtual int GetRtpSendTimeExtnId() const;
// Base method to send packet using NetworkInterface.
bool SendPacket(rtc::CopyOnWriteBuffer* packet,
@@ -294,6 +289,8 @@
};
struct MediaSenderInfo {
+ MediaSenderInfo();
+ ~MediaSenderInfo();
void add_ssrc(const SsrcSenderInfo& stat) {
local_stats.push_back(stat);
}
@@ -339,6 +336,8 @@
};
struct MediaReceiverInfo {
+ MediaReceiverInfo();
+ ~MediaReceiverInfo();
void add_ssrc(const SsrcReceiverInfo& stat) {
local_stats.push_back(stat);
}
@@ -383,6 +382,8 @@
};
struct VoiceSenderInfo : public MediaSenderInfo {
+ VoiceSenderInfo();
+ ~VoiceSenderInfo();
int ext_seqnum = 0;
int jitter_ms = 0;
int audio_level = 0;
@@ -404,6 +405,8 @@
};
struct VoiceReceiverInfo : public MediaReceiverInfo {
+ VoiceReceiverInfo();
+ ~VoiceReceiverInfo();
int ext_seqnum = 0;
int jitter_ms = 0;
int jitter_buffer_ms = 0;
@@ -447,6 +450,8 @@
};
struct VideoSenderInfo : public MediaSenderInfo {
+ VideoSenderInfo();
+ ~VideoSenderInfo();
std::vector<SsrcGroup> ssrc_groups;
// TODO(hbos): Move this to |VideoMediaInfo::send_codecs|?
std::string encoder_implementation_name;
@@ -473,6 +478,8 @@
};
struct VideoReceiverInfo : public MediaReceiverInfo {
+ VideoReceiverInfo();
+ ~VideoReceiverInfo();
std::vector<SsrcGroup> ssrc_groups;
// TODO(hbos): Move this to |VideoMediaInfo::receive_codecs|?
std::string decoder_implementation_name;
@@ -547,6 +554,8 @@
typedef std::map<int, webrtc::RtpCodecParameters> RtpCodecParametersMap;
struct VoiceMediaInfo {
+ VoiceMediaInfo();
+ ~VoiceMediaInfo();
void Clear() {
senders.clear();
receivers.clear();
@@ -560,6 +569,8 @@
};
struct VideoMediaInfo {
+ VideoMediaInfo();
+ ~VideoMediaInfo();
void Clear() {
senders.clear();
receivers.clear();
@@ -577,6 +588,8 @@
};
struct DataMediaInfo {
+ DataMediaInfo();
+ ~DataMediaInfo();
void Clear() {
senders.clear();
receivers.clear();
@@ -636,14 +649,12 @@
};
struct AudioSendParameters : RtpSendParameters<AudioCodec> {
+ AudioSendParameters();
+ ~AudioSendParameters() override;
AudioOptions options;
protected:
- std::map<std::string, std::string> ToStringMap() const override {
- auto params = RtpSendParameters<AudioCodec>::ToStringMap();
- params["options"] = options.ToString();
- return params;
- }
+ std::map<std::string, std::string> ToStringMap() const override;
};
struct AudioRecvParameters : RtpParameters<AudioCodec> {
@@ -654,7 +665,7 @@
VoiceMediaChannel() {}
explicit VoiceMediaChannel(const MediaConfig& config)
: MediaChannel(config) {}
- virtual ~VoiceMediaChannel() {}
+ ~VoiceMediaChannel() override {}
virtual bool SetSendParameters(const AudioSendParameters& params) = 0;
virtual bool SetRecvParameters(const AudioRecvParameters& params) = 0;
virtual webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const = 0;
@@ -702,6 +713,8 @@
// TODO(deadbeef): Rename to VideoSenderParameters, since they're intended to
// encapsulate all the parameters needed for a video RtpSender.
struct VideoSendParameters : RtpSendParameters<VideoCodec> {
+ VideoSendParameters();
+ ~VideoSendParameters() override;
// Use conference mode? This flag comes from the remote
// description's SDP line 'a=x-google-flag:conference', copied over
// by VideoChannel::SetRemoteContent_w, and ultimately used by
@@ -711,11 +724,7 @@
bool conference_mode = false;
protected:
- std::map<std::string, std::string> ToStringMap() const override {
- auto params = RtpSendParameters<VideoCodec>::ToStringMap();
- params["conference_mode"] = (conference_mode ? "yes" : "no");
- return params;
- }
+ std::map<std::string, std::string> ToStringMap() const override;
};
// TODO(deadbeef): Rename to VideoReceiverParameters, since they're intended to
@@ -728,7 +737,7 @@
VideoMediaChannel() {}
explicit VideoMediaChannel(const MediaConfig& config)
: MediaChannel(config) {}
- virtual ~VideoMediaChannel() {}
+ ~VideoMediaChannel() override {}
virtual bool SetSendParameters(const VideoSendParameters& params) = 0;
virtual bool SetRecvParameters(const VideoRecvParameters& params) = 0;
@@ -837,21 +846,21 @@
class DataMediaChannel : public MediaChannel {
public:
- DataMediaChannel() {}
- explicit DataMediaChannel(const MediaConfig& config) : MediaChannel(config) {}
- virtual ~DataMediaChannel() {}
+ DataMediaChannel();
+ explicit DataMediaChannel(const MediaConfig& config);
+ ~DataMediaChannel() override;
virtual bool SetSendParameters(const DataSendParameters& params) = 0;
virtual bool SetRecvParameters(const DataRecvParameters& params) = 0;
// TODO(pthatcher): Implement this.
- virtual bool GetStats(DataMediaInfo* info) { return true; }
+ virtual bool GetStats(DataMediaInfo* info);
virtual bool SetSend(bool send) = 0;
virtual bool SetReceive(bool receive) = 0;
- virtual void OnNetworkRouteChanged(const std::string& transport_name,
- const rtc::NetworkRoute& network_route) {}
+ void OnNetworkRouteChanged(const std::string& transport_name,
+ const rtc::NetworkRoute& network_route) override {}
virtual bool SendData(
const SendDataParams& params,
diff --git a/media/base/mediaengine.cc b/media/base/mediaengine.cc
index d85e127..d40f765 100644
--- a/media/base/mediaengine.cc
+++ b/media/base/mediaengine.cc
@@ -12,6 +12,9 @@
namespace cricket {
+RtpCapabilities::RtpCapabilities() = default;
+RtpCapabilities::~RtpCapabilities() = default;
+
webrtc::RtpParameters CreateRtpParametersWithOneEncoding() {
webrtc::RtpParameters parameters;
webrtc::RtpEncodingParameters encoding;
diff --git a/media/base/mediaengine.h b/media/base/mediaengine.h
index 920ed85..b832174 100644
--- a/media/base/mediaengine.h
+++ b/media/base/mediaengine.h
@@ -39,6 +39,8 @@
namespace cricket {
struct RtpCapabilities {
+ RtpCapabilities();
+ ~RtpCapabilities();
std::vector<webrtc::RtpExtension> header_extensions;
};
diff --git a/media/base/streamparams.cc b/media/base/streamparams.cc
index 2efa0d0..ac09bfb 100644
--- a/media/base/streamparams.cc
+++ b/media/base/streamparams.cc
@@ -38,6 +38,9 @@
return found != nullptr;
}
+MediaStreams::MediaStreams() = default;
+MediaStreams::~MediaStreams() = default;
+
bool MediaStreams::GetAudioStream(
const StreamSelector& selector, StreamParams* stream) {
return GetStream(audio_, selector, stream);
@@ -100,6 +103,16 @@
return ost.str();
}
+SsrcGroup::SsrcGroup(const std::string& usage,
+ const std::vector<uint32_t>& ssrcs)
+ : semantics(usage), ssrcs(ssrcs) {}
+SsrcGroup::SsrcGroup(const SsrcGroup&) = default;
+SsrcGroup::SsrcGroup(SsrcGroup&&) = default;
+SsrcGroup::~SsrcGroup() = default;
+
+SsrcGroup& SsrcGroup::operator=(const SsrcGroup&) = default;
+SsrcGroup& SsrcGroup::operator=(SsrcGroup&&) = default;
+
bool SsrcGroup::has_semantics(const std::string& semantics_in) const {
return (semantics == semantics_in && ssrcs.size() > 0);
}
@@ -113,6 +126,13 @@
return ost.str();
}
+StreamParams::StreamParams() = default;
+StreamParams::StreamParams(const StreamParams&) = default;
+StreamParams::StreamParams(StreamParams&&) = default;
+StreamParams::~StreamParams() = default;
+StreamParams& StreamParams::operator=(const StreamParams&) = default;
+StreamParams& StreamParams::operator=(StreamParams&&) = default;
+
std::string StreamParams::ToString() const {
std::ostringstream ost;
ost << "{";
diff --git a/media/base/streamparams.h b/media/base/streamparams.h
index 52f1918..6523430 100644
--- a/media/base/streamparams.h
+++ b/media/base/streamparams.h
@@ -43,8 +43,12 @@
extern const char kSimSsrcGroupSemantics[];
struct SsrcGroup {
- SsrcGroup(const std::string& usage, const std::vector<uint32_t>& ssrcs)
- : semantics(usage), ssrcs(ssrcs) {}
+ SsrcGroup(const std::string& usage, const std::vector<uint32_t>& ssrcs);
+ SsrcGroup(const SsrcGroup&);
+ SsrcGroup(SsrcGroup&&);
+ ~SsrcGroup();
+ SsrcGroup& operator=(const SsrcGroup&);
+ SsrcGroup& operator=(SsrcGroup&&);
bool operator==(const SsrcGroup& other) const {
return (semantics == other.semantics && ssrcs == other.ssrcs);
@@ -62,6 +66,13 @@
};
struct StreamParams {
+ StreamParams();
+ StreamParams(const StreamParams&);
+ StreamParams(StreamParams&&);
+ ~StreamParams();
+ StreamParams& operator=(const StreamParams&);
+ StreamParams& operator=(StreamParams&&);
+
static StreamParams CreateLegacy(uint32_t ssrc) {
StreamParams stream;
stream.ssrcs.push_back(ssrc);
@@ -216,7 +227,8 @@
// See https://code.google.com/p/webrtc/issues/detail?id=4107
struct MediaStreams {
public:
- MediaStreams() {}
+ MediaStreams();
+ ~MediaStreams();
void CopyFrom(const MediaStreams& sources);
bool empty() const {
