Enable cpplint in media/
Bug: webrtc:5584
Change-Id: I2fd1395d35596d9002e19cc90fcda3a5d4cde9e7
Reviewed-on: https://webrtc-review.googlesource.com/16564
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20504}diff --git a/media/engine/apm_helpers.h b/media/engine/apm_helpers.h
index 50f2e2b..a4ddd49 100644
--- a/media/engine/apm_helpers.h
+++ b/media/engine/apm_helpers.h
@@ -11,6 +11,8 @@
#ifndef MEDIA_ENGINE_APM_HELPERS_H_
#define MEDIA_ENGINE_APM_HELPERS_H_
+#include <cstdint>
+
namespace webrtc {
class AudioProcessing;
@@ -22,8 +24,8 @@
};
struct AgcConfig {
- unsigned short targetLeveldBOv;
- unsigned short digitalCompressionGaindB;
+ uint16_t targetLeveldBOv;
+ uint16_t digitalCompressionGaindB;
bool limiterEnable;
};
diff --git a/media/engine/apm_helpers_unittest.cc b/media/engine/apm_helpers_unittest.cc
index ff9308a..4b537af 100644
--- a/media/engine/apm_helpers_unittest.cc
+++ b/media/engine/apm_helpers_unittest.cc
@@ -247,9 +247,11 @@
// TODO(kthelgason): Reenable this test on simulator.
// See bugs.webrtc.org/5569
#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
-#define MAYBE_TypingDetectionStatus_EnableDisable DISABLED_TypingDetectionStatus_EnableDisable
+#define MAYBE_TypingDetectionStatus_EnableDisable \
+ DISABLED_TypingDetectionStatus_EnableDisable
#else
-#define MAYBE_TypingDetectionStatus_EnableDisable TypingDetectionStatus_EnableDisable
+#define MAYBE_TypingDetectionStatus_EnableDisable \
+ TypingDetectionStatus_EnableDisable
#endif
TEST(ApmHelpersTest, MAYBE_TypingDetectionStatus_EnableDisable) {
TestHelper helper;
diff --git a/media/engine/fakewebrtccall.cc b/media/engine/fakewebrtccall.cc
index d43c7ba..edeaa1a 100644
--- a/media/engine/fakewebrtccall.cc
+++ b/media/engine/fakewebrtccall.cc
@@ -597,9 +597,9 @@
void FakeCall::SetBitrateAllocationStrategy(
std::unique_ptr<rtc::BitrateAllocationStrategy>
- bitrate_allocation_strategy){
- // TODO(alexnarest): not implemented
-};
+ bitrate_allocation_strategy) {
+ // TODO(alexnarest): not implemented
+}
void FakeCall::SignalChannelNetworkState(webrtc::MediaType media,
webrtc::NetworkState state) {
diff --git a/media/engine/fakewebrtcdeviceinfo.h b/media/engine/fakewebrtcdeviceinfo.h
index b32db65..51a5b8e 100644
--- a/media/engine/fakewebrtcdeviceinfo.h
+++ b/media/engine/fakewebrtcdeviceinfo.h
@@ -11,6 +11,7 @@
#ifndef MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_
#define MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_
+#include <string>
#include <vector>
#include "media/engine/webrtcvideocapturer.h"
diff --git a/media/engine/fakewebrtcvideocapturemodule.h b/media/engine/fakewebrtcvideocapturemodule.h
index 2531e1a..bf23a11 100644
--- a/media/engine/fakewebrtcvideocapturemodule.h
+++ b/media/engine/fakewebrtcvideocapturemodule.h
@@ -22,11 +22,8 @@
// Fake class for mocking out webrtc::VideoCaptureModule.
class FakeWebRtcVideoCaptureModule : public webrtc::VideoCaptureModule {
public:
- FakeWebRtcVideoCaptureModule(FakeWebRtcVcmFactory* factory)
- : factory_(factory),
- callback_(NULL),
- running_(false) {
- }
+ explicit FakeWebRtcVideoCaptureModule(FakeWebRtcVcmFactory* factory)
+ : factory_(factory), callback_(NULL), running_(false) {}
~FakeWebRtcVideoCaptureModule();
void RegisterCaptureDataCallback(
rtc::VideoSinkInterface<webrtc::VideoFrame>* callback) override {
diff --git a/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc
index d7b1ba3..f34bb03 100644
--- a/media/engine/payload_type_mapper.cc
+++ b/media/engine/payload_type_mapper.cc
@@ -10,6 +10,8 @@
#include "media/engine/payload_type_mapper.h"
+#include <utility>
+
#include "api/audio_codecs/audio_format.h"
#include "common_types.h" // NOLINT(build/include)
#include "media/base/mediaconstants.h"
diff --git a/media/engine/simulcast.cc b/media/engine/simulcast.cc
index 6ebf66d..f2b3c3a 100644
--- a/media/engine/simulcast.cc
+++ b/media/engine/simulcast.cc
@@ -9,6 +9,8 @@
*/
#include <stdio.h>
+#include <algorithm>
+#include <string>
#include "media/base/streamparams.h"
#include "media/engine/constants.h"
diff --git a/media/engine/simulcast.h b/media/engine/simulcast.h
index 29ecfde..84f8c31 100644
--- a/media/engine/simulcast.h
+++ b/media/engine/simulcast.h
@@ -11,6 +11,7 @@
#ifndef MEDIA_ENGINE_SIMULCAST_H_
#define MEDIA_ENGINE_SIMULCAST_H_
+#include <string>
#include <vector>
#include "call/video_config.h"
diff --git a/media/engine/videodecodersoftwarefallbackwrapper.cc b/media/engine/videodecodersoftwarefallbackwrapper.cc
index e99ea28..4436111 100644
--- a/media/engine/videodecodersoftwarefallbackwrapper.cc
+++ b/media/engine/videodecodersoftwarefallbackwrapper.cc
@@ -11,6 +11,7 @@
#include "media/engine/videodecodersoftwarefallbackwrapper.h"
#include <string>
+#include <utility>
#include "media/engine/internaldecoderfactory.h"
#include "modules/video_coding/include/video_error_codes.h"
diff --git a/media/engine/videoencodersoftwarefallbackwrapper.cc b/media/engine/videoencodersoftwarefallbackwrapper.cc
index f908b6e..daee90e 100644
--- a/media/engine/videoencodersoftwarefallbackwrapper.cc
+++ b/media/engine/videoencodersoftwarefallbackwrapper.cc
@@ -10,6 +10,8 @@
#include "media/engine/videoencodersoftwarefallbackwrapper.h"
+#include <utility>
+
#include "media/base/h264_profile_level_id.h"
#include "media/engine/internalencoderfactory.h"
#include "modules/video_coding/include/video_error_codes.h"
diff --git a/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc b/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
index c3ac434..a261ecf 100644
--- a/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
+++ b/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
@@ -330,12 +330,12 @@
const int kMinLowDurationMs = 4000;
const int kMinPixelsPerFrame = 1;
const int kMinPixelsStop = 320 * 180;
-const std::string kFieldTrial = "WebRTC-VP8-Forced-Fallback-Encoder";
+const char kFieldTrial[] = "WebRTC-VP8-Forced-Fallback-Encoder";
} // namespace
class ForcedFallbackTest : public VideoEncoderSoftwareFallbackWrapperTest {
public:
- ForcedFallbackTest(const std::string& field_trials)
+ explicit ForcedFallbackTest(const std::string& field_trials)
: VideoEncoderSoftwareFallbackWrapperTest(field_trials) {}
~ForcedFallbackTest() override {}
@@ -392,7 +392,7 @@
class ForcedFallbackTestEnabled : public ForcedFallbackTest {
public:
ForcedFallbackTestEnabled()
- : ForcedFallbackTest(kFieldTrial + "/Enabled-" +
+ : ForcedFallbackTest(std::string(kFieldTrial) + "/Enabled-" +
std::to_string(kLowKbps) + "," +
std::to_string(kHighKbps) + "," +
std::to_string(kMinLowDurationMs) + "," +
@@ -402,7 +402,7 @@
class ForcedFallbackTestDisabled : public ForcedFallbackTest {
public:
ForcedFallbackTestDisabled()
- : ForcedFallbackTest(kFieldTrial + "/Disabled/") {}
+ : ForcedFallbackTest(std::string(kFieldTrial) + "/Disabled/") {}
};
TEST_F(ForcedFallbackTestDisabled, NoFallbackWithoutFieldTrial) {
diff --git a/media/engine/webrtcmediaengine.cc b/media/engine/webrtcmediaengine.cc
index 2a79c6b..b82b279 100644
--- a/media/engine/webrtcmediaengine.cc
+++ b/media/engine/webrtcmediaengine.cc
@@ -11,6 +11,9 @@
#include "media/engine/webrtcmediaengine.h"
#include <algorithm>
+#include <memory>
+#include <tuple>
+#include <utility>
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
diff --git a/media/engine/webrtcmediaengine.h b/media/engine/webrtcmediaengine.h
index b9713e9..0d1bb29 100644
--- a/media/engine/webrtcmediaengine.h
+++ b/media/engine/webrtcmediaengine.h
@@ -11,6 +11,7 @@
#ifndef MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
#define MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
+#include <memory>
#include <string>
#include <vector>
diff --git a/media/engine/webrtcmediaengine_unittest.cc b/media/engine/webrtcmediaengine_unittest.cc
index 3726217..1e881c6 100644
--- a/media/engine/webrtcmediaengine_unittest.cc
+++ b/media/engine/webrtcmediaengine_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
+
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "media/engine/webrtcmediaengine.h"
diff --git a/media/engine/webrtcvideocapturer.h b/media/engine/webrtcvideocapturer.h
index 2454f81..a7c49fb 100644
--- a/media/engine/webrtcvideocapturer.h
+++ b/media/engine/webrtcvideocapturer.h
@@ -82,4 +82,4 @@
} // namespace cricket
-#endif // MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
+#endif // MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_
diff --git a/media/engine/webrtcvideocapturer_unittest.cc b/media/engine/webrtcvideocapturer_unittest.cc
index 24cb65d..8770960 100644
--- a/media/engine/webrtcvideocapturer_unittest.cc
+++ b/media/engine/webrtcvideocapturer_unittest.cc
@@ -26,8 +26,8 @@
using cricket::VideoFormat;
-static const std::string kTestDeviceName = "JuberTech FakeCam Q123";
-static const std::string kTestDeviceId = "foo://bar/baz";
+static const char kTestDeviceName[] = "JuberTech FakeCam Q123";
+static const char kTestDeviceId[] = "foo://bar/baz";
const VideoFormat kDefaultVideoFormat =
VideoFormat(640, 400, VideoFormat::FpsToInterval(30), cricket::FOURCC_ANY);
@@ -75,8 +75,7 @@
}
TEST_F(WebRtcVideoCapturerTest, TestInitVcm) {
- EXPECT_TRUE(capturer_->Init(factory_->Create(
- reinterpret_cast<const char*>(kTestDeviceId.c_str()))));
+ EXPECT_TRUE(capturer_->Init(factory_->Create(kTestDeviceId)));
}
TEST_F(WebRtcVideoCapturerTest, TestCapture) {
@@ -101,8 +100,7 @@
}
TEST_F(WebRtcVideoCapturerTest, TestCaptureVcm) {
- EXPECT_TRUE(capturer_->Init(factory_->Create(
- reinterpret_cast<const char*>(kTestDeviceId.c_str()))));
+ EXPECT_TRUE(capturer_->Init(factory_->Create(kTestDeviceId)));
cricket::VideoCapturerListener listener(capturer_.get());
EXPECT_TRUE(capturer_->GetSupportedFormats()->empty());
VideoFormat format;
diff --git a/media/engine/webrtcvideocapturerfactory.cc b/media/engine/webrtcvideocapturerfactory.cc
index e770001..c948101 100644
--- a/media/engine/webrtcvideocapturerfactory.cc
+++ b/media/engine/webrtcvideocapturerfactory.cc
@@ -9,6 +9,7 @@
*/
#include <memory>
+#include <utility>
#include "media/engine/webrtcvideocapturer.h"
#include "media/engine/webrtcvideocapturerfactory.h"
diff --git a/media/engine/webrtcvideocapturerfactory.h b/media/engine/webrtcvideocapturerfactory.h
index da39afd..4f67a52 100644
--- a/media/engine/webrtcvideocapturerfactory.h
+++ b/media/engine/webrtcvideocapturerfactory.h
@@ -12,6 +12,8 @@
#ifndef MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_
#define MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_
+#include <memory>
+
#include "media/base/videocapturerfactory.h"
namespace cricket {
diff --git a/media/engine/webrtcvideodecoderfactory.h b/media/engine/webrtcvideodecoderfactory.h
index 4032aa2..016cb09 100644
--- a/media/engine/webrtcvideodecoderfactory.h
+++ b/media/engine/webrtcvideodecoderfactory.h
@@ -11,6 +11,8 @@
#ifndef MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
#define MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
+#include <string>
+
#include "common_types.h" // NOLINT(build/include)
#include "media/base/codec.h"
#include "rtc_base/refcount.h"
diff --git a/media/engine/webrtcvideoencoderfactory.h b/media/engine/webrtcvideoencoderfactory.h
index 53a529a..97ac03b 100644
--- a/media/engine/webrtcvideoencoderfactory.h
+++ b/media/engine/webrtcvideoencoderfactory.h
@@ -11,6 +11,7 @@
#ifndef MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
#define MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
+#include <string>
#include <vector>
#include "common_types.h" // NOLINT(build/include)
diff --git a/media/engine/webrtcvideoengine_unittest.cc b/media/engine/webrtcvideoengine_unittest.cc
index c3d3446..e9632cb 100644
--- a/media/engine/webrtcvideoengine_unittest.cc
+++ b/media/engine/webrtcvideoengine_unittest.cc
@@ -11,6 +11,7 @@
#include <algorithm>
#include <map>
#include <memory>
+#include <utility>
#include <vector>
#include "api/test/mock_video_decoder_factory.h"
diff --git a/media/engine/webrtcvoe.h b/media/engine/webrtcvoe.h
index 5a25d44..d303d30 100644
--- a/media/engine/webrtcvoe.h
+++ b/media/engine/webrtcvoe.h
@@ -74,9 +74,7 @@
VoEWrapper()
: engine_(webrtc::VoiceEngine::Create()), base_(engine_) {
}
- VoEWrapper(webrtc::VoEBase* base)
- : engine_(NULL), base_(base) {
- }
+ explicit VoEWrapper(webrtc::VoEBase* base) : engine_(NULL), base_(base) {}
~VoEWrapper() {}
webrtc::VoiceEngine* engine() const { return engine_.get(); }
webrtc::VoEBase* base() const { return base_.get(); }
diff --git a/media/engine/webrtcvoiceengine.cc b/media/engine/webrtcvoiceengine.cc
index f70093d..e2428cf 100644
--- a/media/engine/webrtcvoiceengine.cc
+++ b/media/engine/webrtcvoiceengine.cc
@@ -16,6 +16,7 @@
#include <cstdio>
#include <functional>
#include <string>
+#include <utility>
#include <vector>
#include "api/call/audio_sink.h"
@@ -77,7 +78,9 @@
class ProxySink : public webrtc::AudioSinkInterface {
public:
- ProxySink(AudioSinkInterface* sink) : sink_(sink) { RTC_DCHECK(sink); }
+ explicit ProxySink(AudioSinkInterface* sink) : sink_(sink) {
+ RTC_DCHECK(sink);
+ }
void OnData(const Data& audio) override { sink_->OnData(audio); }
@@ -418,7 +421,7 @@
"WebRTC-Audio-MinimizeResamplingOnMobile")) {
options.auto_gain_control = rtc::Optional<bool>(false);
LOG(LS_INFO) << "Disable AGC according to field trial.";
- if (!(options.noise_suppression.value_or(false) or
+ if (!(options.noise_suppression.value_or(false) ||
options.echo_cancellation.value_or(false))) {
// If possible, turn off the high-pass filter.
LOG(LS_INFO) << "Disable high-pass filter in response to field trial.";
diff --git a/media/engine/webrtcvoiceengine_unittest.cc b/media/engine/webrtcvoiceengine_unittest.cc
index c8a452a..e8c9a22 100644
--- a/media/engine/webrtcvoiceengine_unittest.cc
+++ b/media/engine/webrtcvoiceengine_unittest.cc
@@ -9,6 +9,7 @@
*/
#include <memory>
+#include <utility>
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"