From 8e9fd4857e2eaf85986c135ce0a9f80999e8f5bd Mon Sep 17 00:00:00 2001 From: Nikita Zetilov Date: Fri, 6 Mar 2020 10:43:41 +0100 Subject: [PATCH] Fix FakeVp8Encoder name. Bug: None Change-Id: Iaa11a452fcb6fb6f33d1396eb4e6fe9c050166ad Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169845 Commit-Queue: Nikita Zetilov Reviewed-by: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#30703} --- test/call_test.cc | 2 +- test/fake_vp8_encoder.cc | 12 ++++++------ test/fake_vp8_encoder.h | 7 ++++--- test/fake_vp8_encoder_unittest.cc | 2 +- test/peer_scenario/peer_scenario_client.cc | 2 +- test/scenario/video_stream.cc | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/test/call_test.cc b/test/call_test.cc index 0c30681cf7..983681c0b5 100644 --- a/test/call_test.cc +++ b/test/call_test.cc @@ -43,7 +43,7 @@ CallTest::CallTest() fake_encoder_factory_([this]() { std::unique_ptr fake_encoder; if (video_encoder_configs_[0].codec_type == kVideoCodecVP8) { - fake_encoder = std::make_unique(clock_); + fake_encoder = std::make_unique(clock_); } else { fake_encoder = std::make_unique(clock_); } diff --git a/test/fake_vp8_encoder.cc b/test/fake_vp8_encoder.cc index 60bc36c570..8397e5f544 100644 --- a/test/fake_vp8_encoder.cc +++ b/test/fake_vp8_encoder.cc @@ -45,11 +45,11 @@ namespace webrtc { namespace test { -FakeVP8Encoder::FakeVP8Encoder(Clock* clock) : FakeEncoder(clock) { +FakeVp8Encoder::FakeVp8Encoder(Clock* clock) : FakeEncoder(clock) { sequence_checker_.Detach(); } -int32_t FakeVP8Encoder::InitEncode(const VideoCodec* config, +int32_t FakeVp8Encoder::InitEncode(const VideoCodec* config, const Settings& settings) { RTC_DCHECK_RUN_ON(&sequence_checker_); auto result = FakeEncoder::InitEncode(config, settings); @@ -64,13 +64,13 @@ int32_t FakeVP8Encoder::InitEncode(const VideoCodec* config, return WEBRTC_VIDEO_CODEC_OK; } -int32_t FakeVP8Encoder::Release() { +int32_t FakeVp8Encoder::Release() { auto result = FakeEncoder::Release(); sequence_checker_.Detach(); return result; } -void FakeVP8Encoder::PopulateCodecSpecific(CodecSpecificInfo* codec_specific, +void FakeVp8Encoder::PopulateCodecSpecific(CodecSpecificInfo* codec_specific, size_t size_bytes, VideoFrameType frame_type, int stream_idx, @@ -88,7 +88,7 @@ void FakeVP8Encoder::PopulateCodecSpecific(CodecSpecificInfo* codec_specific, } } -std::unique_ptr FakeVP8Encoder::EncodeHook( +std::unique_ptr FakeVp8Encoder::EncodeHook( EncodedImage* encoded_image, CodecSpecificInfo* codec_specific) { RTC_DCHECK_RUN_ON(&sequence_checker_); @@ -107,7 +107,7 @@ std::unique_ptr FakeVP8Encoder::EncodeHook( return nullptr; } -VideoEncoder::EncoderInfo FakeVP8Encoder::GetEncoderInfo() const { +VideoEncoder::EncoderInfo FakeVp8Encoder::GetEncoderInfo() const { EncoderInfo info; info.implementation_name = "FakeVp8Encoder"; return info; diff --git a/test/fake_vp8_encoder.h b/test/fake_vp8_encoder.h index a0d8e167c7..dde7e4fc7e 100644 --- a/test/fake_vp8_encoder.h +++ b/test/fake_vp8_encoder.h @@ -32,10 +32,10 @@ namespace webrtc { namespace test { -class FakeVP8Encoder : public FakeEncoder { +class FakeVp8Encoder : public FakeEncoder { public: - explicit FakeVP8Encoder(Clock* clock); - virtual ~FakeVP8Encoder() = default; + explicit FakeVp8Encoder(Clock* clock); + virtual ~FakeVp8Encoder() = default; int32_t InitEncode(const VideoCodec* config, const Settings& settings) override; @@ -70,6 +70,7 @@ class FakeVP8Encoder : public FakeEncoder { std::unique_ptr frame_buffer_controller_ RTC_GUARDED_BY(sequence_checker_); }; +using FakeVP8Encoder = FakeVp8Encoder; } // namespace test } // namespace webrtc diff --git a/test/fake_vp8_encoder_unittest.cc b/test/fake_vp8_encoder_unittest.cc index 454f9461c1..d35083f0d8 100644 --- a/test/fake_vp8_encoder_unittest.cc +++ b/test/fake_vp8_encoder_unittest.cc @@ -28,7 +28,7 @@ namespace { std::unique_ptr CreateSpecificSimulcastTestFixture() { std::unique_ptr encoder_factory = std::make_unique([]() { - return std::make_unique(Clock::GetRealTimeClock()); + return std::make_unique(Clock::GetRealTimeClock()); }); std::unique_ptr decoder_factory = std::make_unique( diff --git a/test/peer_scenario/peer_scenario_client.cc b/test/peer_scenario/peer_scenario_client.cc index da8dec80e3..1ae53ee86b 100644 --- a/test/peer_scenario/peer_scenario_client.cc +++ b/test/peer_scenario/peer_scenario_client.cc @@ -131,7 +131,7 @@ class FakeVideoEncoderFactory : public VideoEncoderFactory { } std::unique_ptr CreateVideoEncoder( const SdpVideoFormat& format) override { - return std::make_unique(clock_); + return std::make_unique(clock_); } private: diff --git a/test/scenario/video_stream.cc b/test/scenario/video_stream.cc index 89912e4c76..d842b1cc31 100644 --- a/test/scenario/video_stream.cc +++ b/test/scenario/video_stream.cc @@ -375,7 +375,7 @@ SendVideoStream::SendVideoStream(CallClient* sender, rtc::CritScope cs(&crit_); std::unique_ptr encoder; if (config_.encoder.codec == Codec::kVideoCodecVP8) { - encoder = std::make_unique(sender_->clock_); + encoder = std::make_unique(sender_->clock_); } else if (config_.encoder.codec == Codec::kVideoCodecGeneric) { encoder = std::make_unique(sender_->clock_); } else {