From e78bcb97c3b45b19e973d12557310acb16a04b54 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Tue, 31 Oct 2017 09:53:08 -0700 Subject: [PATCH] Enable cpplint in media/ Bug: webrtc:5584 Change-Id: I2fd1395d35596d9002e19cc90fcda3a5d4cde9e7 Reviewed-on: https://webrtc-review.googlesource.com/16564 Commit-Queue: Steve Anton Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#20504} --- PRESUBMIT.py | 5 ++++- media/base/adaptedvideotracksource.h | 2 +- media/base/codec_unittest.cc | 6 +++--- media/base/device.h | 2 ++ media/base/fakemediaengine.h | 4 ++-- media/base/fakenetworkinterface.h | 1 + media/base/mediachannel.h | 3 ++- media/base/mediaengine.h | 2 ++ media/base/rtpdataengine.cc | 2 ++ media/base/rtpdataengine.h | 3 ++- media/base/rtputils.cc | 2 +- media/base/rtputils_unittest.cc | 2 ++ media/base/videoadapter.cc | 1 + media/base/videoadapter_unittest.cc | 1 + media/base/videobroadcaster_unittest.cc | 2 ++ media/base/videocommon.h | 4 ++-- media/base/videosinkinterface.h | 2 +- media/base/videosourceinterface.h | 2 ++ media/engine/apm_helpers.h | 6 ++++-- media/engine/apm_helpers_unittest.cc | 6 ++++-- media/engine/fakewebrtccall.cc | 6 +++--- media/engine/fakewebrtcdeviceinfo.h | 1 + media/engine/fakewebrtcvideocapturemodule.h | 7 ++----- media/engine/payload_type_mapper.cc | 2 ++ media/engine/simulcast.cc | 2 ++ media/engine/simulcast.h | 1 + media/engine/videodecodersoftwarefallbackwrapper.cc | 1 + media/engine/videoencodersoftwarefallbackwrapper.cc | 2 ++ .../videoencodersoftwarefallbackwrapper_unittest.cc | 8 ++++---- media/engine/webrtcmediaengine.cc | 3 +++ media/engine/webrtcmediaengine.h | 1 + media/engine/webrtcmediaengine_unittest.cc | 2 ++ media/engine/webrtcvideocapturer.h | 2 +- media/engine/webrtcvideocapturer_unittest.cc | 10 ++++------ media/engine/webrtcvideocapturerfactory.cc | 1 + media/engine/webrtcvideocapturerfactory.h | 2 ++ media/engine/webrtcvideodecoderfactory.h | 2 ++ media/engine/webrtcvideoencoderfactory.h | 1 + media/engine/webrtcvideoengine_unittest.cc | 1 + media/engine/webrtcvoe.h | 4 +--- media/engine/webrtcvoiceengine.cc | 7 +++++-- media/engine/webrtcvoiceengine_unittest.cc | 1 + 42 files changed, 84 insertions(+), 41 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 80e461ab98..69751a82df 100755 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -20,7 +20,10 @@ CPPLINT_BLACKLIST = [ 'common_types.cc', 'common_types.h', 'examples/objc', - 'media', + 'media/base/streamparams.h', + 'media/base/videocommon.h', + 'media/engine/fakewebrtcdeviceinfo.h', + 'media/sctp/sctptransport.cc', 'modules/audio_coding', 'modules/audio_device', 'modules/audio_processing', diff --git a/media/base/adaptedvideotracksource.h b/media/base/adaptedvideotracksource.h index 82b323789d..0db381f5fb 100644 --- a/media/base/adaptedvideotracksource.h +++ b/media/base/adaptedvideotracksource.h @@ -30,7 +30,7 @@ class AdaptedVideoTrackSource protected: // Allows derived classes to initialize |video_adapter_| with a custom // alignment. - AdaptedVideoTrackSource(int required_alignment); + explicit AdaptedVideoTrackSource(int required_alignment); // Checks the apply_rotation() flag. If the frame needs rotation, and it is a // plain memory frame, it is rotated. Subclasses producing native frames must // handle apply_rotation() themselves. diff --git a/media/base/codec_unittest.cc b/media/base/codec_unittest.cc index 115808b472..394385e908 100644 --- a/media/base/codec_unittest.cc +++ b/media/base/codec_unittest.cc @@ -229,9 +229,9 @@ TEST(CodecTest, TestIntersectFeedbackParams) { const FeedbackParam b3("b", "3"); const FeedbackParam c3("c", "3"); TestCodec c1; - c1.AddFeedbackParam(a1); // Only match with c2. - c1.AddFeedbackParam(b2); // Same param different values. - c1.AddFeedbackParam(c3); // Not in c2. + c1.AddFeedbackParam(a1); // Only match with c2. + c1.AddFeedbackParam(b2); // Same param different values. + c1.AddFeedbackParam(c3); // Not in c2. TestCodec c2; c2.AddFeedbackParam(a1); c2.AddFeedbackParam(b3); diff --git a/media/base/device.h b/media/base/device.h index ae9567df19..f47293823f 100644 --- a/media/base/device.h +++ b/media/base/device.h @@ -11,6 +11,8 @@ #ifndef MEDIA_BASE_DEVICE_H_ #define MEDIA_BASE_DEVICE_H_ +#include + #include "rtc_base/stringencode.h" namespace cricket { diff --git a/media/base/fakemediaengine.h b/media/base/fakemediaengine.h index 7b09dd4f0c..e067c1977f 100644 --- a/media/base/fakemediaengine.h +++ b/media/base/fakemediaengine.h @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include #include "api/call/audio_sink.h" @@ -948,8 +950,6 @@ inline FakeVideoMediaChannel::~FakeVideoMediaChannel() { class FakeDataEngine : public DataEngineInterface { public: - FakeDataEngine(){}; - virtual DataMediaChannel* CreateChannel(const MediaConfig& config) { FakeDataMediaChannel* ch = new FakeDataMediaChannel(this, DataOptions()); channels_.push_back(ch); diff --git a/media/base/fakenetworkinterface.h b/media/base/fakenetworkinterface.h index 7f5dea01ab..3d98d1f917 100644 --- a/media/base/fakenetworkinterface.h +++ b/media/base/fakenetworkinterface.h @@ -12,6 +12,7 @@ #define MEDIA_BASE_FAKENETWORKINTERFACE_H_ #include +#include #include #include "media/base/mediachannel.h" diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h index 06766a851f..1fed49c65c 100644 --- a/media/base/mediachannel.h +++ b/media/base/mediachannel.h @@ -11,6 +11,7 @@ #ifndef MEDIA_BASE_MEDIACHANNEL_H_ #define MEDIA_BASE_MEDIACHANNEL_H_ +#include #include #include #include @@ -1223,7 +1224,7 @@ class DataMediaChannel : public MediaChannel { }; DataMediaChannel() {} - DataMediaChannel(const MediaConfig& config) : MediaChannel(config) {} + explicit DataMediaChannel(const MediaConfig& config) : MediaChannel(config) {} virtual ~DataMediaChannel() {} virtual bool SetSendParameters(const DataSendParameters& params) = 0; diff --git a/media/base/mediaengine.h b/media/base/mediaengine.h index 5fa05c6dd9..483a96b7e8 100644 --- a/media/base/mediaengine.h +++ b/media/base/mediaengine.h @@ -16,6 +16,8 @@ #endif #include +#include +#include #include #include "api/audio_codecs/audio_decoder_factory.h" diff --git a/media/base/rtpdataengine.cc b/media/base/rtpdataengine.cc index 47977e8d72..cacf973169 100644 --- a/media/base/rtpdataengine.cc +++ b/media/base/rtpdataengine.cc @@ -10,6 +10,8 @@ #include "media/base/rtpdataengine.h" +#include + #include "media/base/codec.h" #include "media/base/mediaconstants.h" #include "media/base/rtputils.h" diff --git a/media/base/rtpdataengine.h b/media/base/rtpdataengine.h index 7dd182e599..525bc026a3 100644 --- a/media/base/rtpdataengine.h +++ b/media/base/rtpdataengine.h @@ -11,6 +11,7 @@ #ifndef MEDIA_BASE_RTPDATAENGINE_H_ #define MEDIA_BASE_RTPDATAENGINE_H_ +#include #include #include #include @@ -61,7 +62,7 @@ class RtpClock { class RtpDataMediaChannel : public DataMediaChannel { public: - RtpDataMediaChannel(const MediaConfig& config); + explicit RtpDataMediaChannel(const MediaConfig& config); virtual ~RtpDataMediaChannel(); virtual bool SetSendParameters(const DataSendParameters& params); diff --git a/media/base/rtputils.cc b/media/base/rtputils.cc index 5147003715..d0ba1cf72b 100644 --- a/media/base/rtputils.cc +++ b/media/base/rtputils.cc @@ -114,7 +114,7 @@ void UpdateRtpAuthTag(uint8_t* rtp, memcpy(auth_tag, output, tag_length); } -} +} // namespace bool GetUint8(const void* data, size_t offset, int* value) { if (!data || !value) { diff --git a/media/base/rtputils_unittest.cc b/media/base/rtputils_unittest.cc index ada1b50533..a71eac7a07 100644 --- a/media/base/rtputils_unittest.cc +++ b/media/base/rtputils_unittest.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include + #include "media/base/rtputils.h" #include "media/base/fakertp.h" #include "rtc_base/asyncpacketsocket.h" diff --git a/media/base/videoadapter.cc b/media/base/videoadapter.cc index 1cf834415d..7fb02e15fe 100644 --- a/media/base/videoadapter.cc +++ b/media/base/videoadapter.cc @@ -14,6 +14,7 @@ #include #include #include +#include #include "api/optional.h" #include "media/base/mediaconstants.h" diff --git a/media/base/videoadapter_unittest.cc b/media/base/videoadapter_unittest.cc index b05d1e3607..522cd5ddea 100644 --- a/media/base/videoadapter_unittest.cc +++ b/media/base/videoadapter_unittest.cc @@ -10,6 +10,7 @@ #include // For INT_MAX +#include #include #include #include diff --git a/media/base/videobroadcaster_unittest.cc b/media/base/videobroadcaster_unittest.cc index ee39b617c2..779a5d02ee 100644 --- a/media/base/videobroadcaster_unittest.cc +++ b/media/base/videobroadcaster_unittest.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include + #include "media/base/videobroadcaster.h" #include "api/video/i420_buffer.h" #include "api/video/video_frame.h" diff --git a/media/base/videocommon.h b/media/base/videocommon.h index df977977e2..264482b7c8 100644 --- a/media/base/videocommon.h +++ b/media/base/videocommon.h @@ -10,7 +10,7 @@ // Common definition for video, including fourcc and VideoFormat. -#ifndef MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT +#ifndef MEDIA_BASE_VIDEOCOMMON_H_ #define MEDIA_BASE_VIDEOCOMMON_H_ #include @@ -226,4 +226,4 @@ struct VideoFormat : VideoFormatPod { } // namespace cricket -#endif // MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT +#endif // MEDIA_BASE_VIDEOCOMMON_H_ diff --git a/media/base/videosinkinterface.h b/media/base/videosinkinterface.h index e8e48d884a..900e786f24 100644 --- a/media/base/videosinkinterface.h +++ b/media/base/videosinkinterface.h @@ -26,7 +26,7 @@ class VideoSinkInterface { // Should be called by the source when it discards the frame due to rate // limiting. - virtual void OnDiscardedFrame(){}; + virtual void OnDiscardedFrame() {} }; } // namespace rtc diff --git a/media/base/videosourceinterface.h b/media/base/videosourceinterface.h index b68011d045..701ddec492 100644 --- a/media/base/videosourceinterface.h +++ b/media/base/videosourceinterface.h @@ -11,6 +11,8 @@ #ifndef MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ #define MEDIA_BASE_VIDEOSOURCEINTERFACE_H_ +#include + #include "api/optional.h" #include "media/base/videosinkinterface.h" diff --git a/media/engine/apm_helpers.h b/media/engine/apm_helpers.h index 50f2e2b81f..a4ddd49d25 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 + namespace webrtc { class AudioProcessing; @@ -22,8 +24,8 @@ enum EcModes { }; 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 ff9308a47e..4b537af7c4 100644 --- a/media/engine/apm_helpers_unittest.cc +++ b/media/engine/apm_helpers_unittest.cc @@ -247,9 +247,11 @@ TEST(ApmHelpersTest, TypingDetectionStatus_DefaultMode) { // 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 d43c7ba8a3..edeaa1a3cc 100644 --- a/media/engine/fakewebrtccall.cc +++ b/media/engine/fakewebrtccall.cc @@ -597,9 +597,9 @@ void FakeCall::SetBitrateConfigMask( void FakeCall::SetBitrateAllocationStrategy( std::unique_ptr - 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 b32db652f1..51a5b8e50c 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 #include #include "media/engine/webrtcvideocapturer.h" diff --git a/media/engine/fakewebrtcvideocapturemodule.h b/media/engine/fakewebrtcvideocapturemodule.h index 2531e1a6ac..bf23a11277 100644 --- a/media/engine/fakewebrtcvideocapturemodule.h +++ b/media/engine/fakewebrtcvideocapturemodule.h @@ -22,11 +22,8 @@ class FakeWebRtcVcmFactory; // 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* callback) override { diff --git a/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc index d7b1ba38ed..f34bb03ab2 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 + #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 6ebf66dd50..f2b3c3addf 100644 --- a/media/engine/simulcast.cc +++ b/media/engine/simulcast.cc @@ -9,6 +9,8 @@ */ #include +#include +#include #include "media/base/streamparams.h" #include "media/engine/constants.h" diff --git a/media/engine/simulcast.h b/media/engine/simulcast.h index 29ecfde1d1..84f8c31a89 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 #include #include "call/video_config.h" diff --git a/media/engine/videodecodersoftwarefallbackwrapper.cc b/media/engine/videodecodersoftwarefallbackwrapper.cc index e99ea285fe..4436111a7c 100644 --- a/media/engine/videodecodersoftwarefallbackwrapper.cc +++ b/media/engine/videodecodersoftwarefallbackwrapper.cc @@ -11,6 +11,7 @@ #include "media/engine/videodecodersoftwarefallbackwrapper.h" #include +#include #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 f908b6e91c..daee90ef85 100644 --- a/media/engine/videoencodersoftwarefallbackwrapper.cc +++ b/media/engine/videoencodersoftwarefallbackwrapper.cc @@ -10,6 +10,8 @@ #include "media/engine/videoencodersoftwarefallbackwrapper.h" +#include + #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 c3ac434462..a261ecfc65 100644 --- a/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc +++ b/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc @@ -330,12 +330,12 @@ const int kHighKbps = 300; 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 ForcedFallbackTest : public VideoEncoderSoftwareFallbackWrapperTest { 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 ForcedFallbackTestEnabled : public ForcedFallbackTest { 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 2a79c6b609..b82b279277 100644 --- a/media/engine/webrtcmediaengine.cc +++ b/media/engine/webrtcmediaengine.cc @@ -11,6 +11,9 @@ #include "media/engine/webrtcmediaengine.h" #include +#include +#include +#include #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 b9713e985b..0d1bb2993a 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 #include #include diff --git a/media/engine/webrtcmediaengine_unittest.cc b/media/engine/webrtcmediaengine_unittest.cc index 372621734b..1e881c6390 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 + #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 2454f819bc..a7c49fb14c 100644 --- a/media/engine/webrtcvideocapturer.h +++ b/media/engine/webrtcvideocapturer.h @@ -82,4 +82,4 @@ class WebRtcVideoCapturer : public VideoCapturer, } // 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 24cb65d0be..8770960c4c 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, TestInit) { } TEST_F(WebRtcVideoCapturerTest, TestInitVcm) { - EXPECT_TRUE(capturer_->Init(factory_->Create( - reinterpret_cast(kTestDeviceId.c_str())))); + EXPECT_TRUE(capturer_->Init(factory_->Create(kTestDeviceId))); } TEST_F(WebRtcVideoCapturerTest, TestCapture) { @@ -101,8 +100,7 @@ TEST_F(WebRtcVideoCapturerTest, TestCapture) { } TEST_F(WebRtcVideoCapturerTest, TestCaptureVcm) { - EXPECT_TRUE(capturer_->Init(factory_->Create( - reinterpret_cast(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 e7700010c1..c948101ea8 100644 --- a/media/engine/webrtcvideocapturerfactory.cc +++ b/media/engine/webrtcvideocapturerfactory.cc @@ -9,6 +9,7 @@ */ #include +#include #include "media/engine/webrtcvideocapturer.h" #include "media/engine/webrtcvideocapturerfactory.h" diff --git a/media/engine/webrtcvideocapturerfactory.h b/media/engine/webrtcvideocapturerfactory.h index da39afd510..4f67a52237 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 + #include "media/base/videocapturerfactory.h" namespace cricket { diff --git a/media/engine/webrtcvideodecoderfactory.h b/media/engine/webrtcvideodecoderfactory.h index 4032aa2a5d..016cb09da0 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 + #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 53a529aadf..97ac03b473 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 #include #include "common_types.h" // NOLINT(build/include) diff --git a/media/engine/webrtcvideoengine_unittest.cc b/media/engine/webrtcvideoengine_unittest.cc index c3d3446724..e9632cb804 100644 --- a/media/engine/webrtcvideoengine_unittest.cc +++ b/media/engine/webrtcvideoengine_unittest.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "api/test/mock_video_decoder_factory.h" diff --git a/media/engine/webrtcvoe.h b/media/engine/webrtcvoe.h index 5a25d44d29..d303d30ccd 100644 --- a/media/engine/webrtcvoe.h +++ b/media/engine/webrtcvoe.h @@ -74,9 +74,7 @@ class VoEWrapper { 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 f70093d2e9..e2428cfa1a 100644 --- a/media/engine/webrtcvoiceengine.cc +++ b/media/engine/webrtcvoiceengine.cc @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "api/call/audio_sink.h" @@ -77,7 +78,9 @@ const int kMaxPayloadType = 127; 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 @@ bool WebRtcVoiceEngine::ApplyOptions(const AudioOptions& options_in) { "WebRTC-Audio-MinimizeResamplingOnMobile")) { options.auto_gain_control = rtc::Optional(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 c8a452a99b..e8c9a221a1 100644 --- a/media/engine/webrtcvoiceengine_unittest.cc +++ b/media/engine/webrtcvoiceengine_unittest.cc @@ -9,6 +9,7 @@ */ #include +#include #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h"