From 9e79e6b9b3b560f9fc18895620af286c0ee4855a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Thu, 25 Apr 2019 16:01:03 +0200 Subject: [PATCH] Consolidate mock video encoders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the MockVideoEncoder from the api target in encoder_simulcast_proxy_unittest, rather than a custom MockEncoder. This also prevents issue when new SetRates() is made pure virtual. Bug: webrtc:10481 Change-Id: I72469803c00f7014eeac5b9321d1e0d716fa245d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134211 Reviewed-by: Niels Moller Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#27774} --- media/BUILD.gn | 1 + .../encoder_simulcast_proxy_unittest.cc | 43 ++++--------------- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/media/BUILD.gn b/media/BUILD.gn index fbed41daee..f28461e275 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -509,6 +509,7 @@ if (rtc_include_tests) { "../api:mock_video_bitrate_allocator", "../api:mock_video_bitrate_allocator_factory", "../api:mock_video_codec_factory", + "../api:mock_video_encoder", "../api:scoped_refptr", "../api:simulcast_test_fixture_api", "../api/audio_codecs:builtin_audio_decoder_factory", diff --git a/media/engine/encoder_simulcast_proxy_unittest.cc b/media/engine/encoder_simulcast_proxy_unittest.cc index a283ea5477..daa4d3e66a 100644 --- a/media/engine/encoder_simulcast_proxy_unittest.cc +++ b/media/engine/encoder_simulcast_proxy_unittest.cc @@ -12,6 +12,7 @@ #include "media/engine/encoder_simulcast_proxy.h" #include +#include "api/test/mock_video_encoder.h" #include "api/test/mock_video_encoder_factory.h" #include "api/video_codecs/vp8_temporal_layers.h" #include "modules/video_coding/include/video_codec_interface.h" @@ -26,32 +27,6 @@ using ::testing::_; using ::testing::NiceMock; using ::testing::Return; -class MockEncoder : public VideoEncoder { - public: - // TODO(nisse): Valid overrides commented out, because the gmock - // methods don't use any override declarations, and we want to avoid - // warnings from -Winconsistent-missing-override. See - // http://crbug.com/428099. - MockEncoder() {} - virtual ~MockEncoder() {} - - MOCK_METHOD3(InitEncode, - int32_t(const VideoCodec* codec_settings, - int32_t number_of_cores, - size_t max_payload_size)); - - MOCK_METHOD1(RegisterEncodeCompleteCallback, int32_t(EncodedImageCallback*)); - - MOCK_METHOD0(Release, int32_t()); - - MOCK_METHOD2( - Encode, - int32_t(const VideoFrame& inputImage, - const std::vector* frame_types) /* override */); - - MOCK_CONST_METHOD0(GetEncoderInfo, VideoEncoder::EncoderInfo(void)); -}; - TEST(EncoderSimulcastProxy, ChoosesCorrectImplementation) { const std::string kImplementationName = "Fake"; const std::string kSimulcastAdaptedImplementationName = @@ -84,7 +59,7 @@ TEST(EncoderSimulcastProxy, ChoosesCorrectImplementation) { 56}; codec_settings.numberOfSimulcastStreams = 3; - NiceMock* mock_encoder = new NiceMock(); + NiceMock* mock_encoder = new NiceMock(); NiceMock simulcast_factory; EXPECT_CALL(*mock_encoder, InitEncode(_, _, _)) @@ -105,10 +80,10 @@ TEST(EncoderSimulcastProxy, ChoosesCorrectImplementation) { EXPECT_EQ(kImplementationName, simulcast_enabled_proxy.GetEncoderInfo().implementation_name); - NiceMock* mock_encoder1 = new NiceMock(); - NiceMock* mock_encoder2 = new NiceMock(); - NiceMock* mock_encoder3 = new NiceMock(); - NiceMock* mock_encoder4 = new NiceMock(); + NiceMock* mock_encoder1 = new NiceMock(); + NiceMock* mock_encoder2 = new NiceMock(); + NiceMock* mock_encoder3 = new NiceMock(); + NiceMock* mock_encoder4 = new NiceMock(); NiceMock nonsimulcast_factory; EXPECT_CALL(*mock_encoder1, InitEncode(_, _, _)) @@ -152,7 +127,7 @@ TEST(EncoderSimulcastProxy, ChoosesCorrectImplementation) { } TEST(EncoderSimulcastProxy, ForwardsTrustedSetting) { - NiceMock* mock_encoder = new NiceMock(); + NiceMock* mock_encoder = new NiceMock(); NiceMock simulcast_factory; EXPECT_CALL(*mock_encoder, InitEncode(_, _, _)) @@ -178,7 +153,7 @@ TEST(EncoderSimulcastProxy, ForwardsTrustedSetting) { } TEST(EncoderSimulcastProxy, ForwardsHardwareAccelerated) { - NiceMock* mock_encoder = new NiceMock(); + NiceMock* mock_encoder = new NiceMock(); NiceMock simulcast_factory; EXPECT_CALL(*mock_encoder, InitEncode(_, _, _)) @@ -208,7 +183,7 @@ TEST(EncoderSimulcastProxy, ForwardsHardwareAccelerated) { } TEST(EncoderSimulcastProxy, ForwardsInternalSource) { - NiceMock* mock_encoder = new NiceMock(); + NiceMock* mock_encoder = new NiceMock(); NiceMock simulcast_factory; EXPECT_CALL(*mock_encoder, InitEncode(_, _, _))