From 04afc1ff659c9887ef7bd841c14ed557867c83fb Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Tue, 11 Aug 2020 12:20:49 +0200 Subject: [PATCH] Delete legacy MockEncodedImageCallback::OnEncodedFrame MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:6471 Change-Id: I633965487e0eb9ed03934179c41cd66fdfff7359 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181261 Reviewed-by: Erik Språng Reviewed-by: Sebastian Jansson Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#31922} --- api/test/mock_video_encoder.h | 6 ------ .../utility/simulcast_test_fixture_impl.cc | 16 +++++++--------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/api/test/mock_video_encoder.h b/api/test/mock_video_encoder.h index b4ae27106a..11e0f64b3f 100644 --- a/api/test/mock_video_encoder.h +++ b/api/test/mock_video_encoder.h @@ -20,12 +20,6 @@ namespace webrtc { class MockEncodedImageCallback : public EncodedImageCallback { public: - MOCK_METHOD(Result, - OnEncodedImage, - (const EncodedImage& encodedImage, - const CodecSpecificInfo*, - const RTPFragmentationHeader*), - (override)); MOCK_METHOD(Result, OnEncodedImage, (const EncodedImage&, const CodecSpecificInfo*), diff --git a/modules/video_coding/utility/simulcast_test_fixture_impl.cc b/modules/video_coding/utility/simulcast_test_fixture_impl.cc index f4e029420c..93d6fb7b25 100644 --- a/modules/video_coding/utility/simulcast_test_fixture_impl.cc +++ b/modules/video_coding/utility/simulcast_test_fixture_impl.cc @@ -75,8 +75,7 @@ class SimulcastTestFixtureImpl::TestEncodedImageCallback } Result OnEncodedImage(const EncodedImage& encoded_image, - const CodecSpecificInfo* codec_specific_info, - const RTPFragmentationHeader* fragmentation) override { + const CodecSpecificInfo* codec_specific_info) override { bool is_vp8 = (codec_specific_info->codecType == kVideoCodecVP8); bool is_h264 = (codec_specific_info->codecType == kVideoCodecH264); // Only store the base layer. @@ -352,7 +351,7 @@ void SimulcastTestFixtureImpl::ExpectStreams( AllOf(Field(&EncodedImage::_frameType, frame_type), Field(&EncodedImage::_encodedWidth, kDefaultWidth / 4), Field(&EncodedImage::_encodedHeight, kDefaultHeight / 4)), - _, _)) + _)) .Times(1) .WillRepeatedly(Return( EncodedImageCallback::Result(EncodedImageCallback::Result::OK, 0))); @@ -364,7 +363,7 @@ void SimulcastTestFixtureImpl::ExpectStreams( AllOf(Field(&EncodedImage::_frameType, frame_type), Field(&EncodedImage::_encodedWidth, kDefaultWidth / 2), Field(&EncodedImage::_encodedHeight, kDefaultHeight / 2)), - _, _)) + _)) .Times(1) .WillRepeatedly(Return( EncodedImageCallback::Result(EncodedImageCallback::Result::OK, 0))); @@ -375,7 +374,7 @@ void SimulcastTestFixtureImpl::ExpectStreams( AllOf(Field(&EncodedImage::_frameType, frame_type), Field(&EncodedImage::_encodedWidth, kDefaultWidth), Field(&EncodedImage::_encodedHeight, kDefaultHeight)), - _, _)) + _)) .Times(1) .WillRepeatedly(Return( EncodedImageCallback::Result(EncodedImageCallback::Result::OK, 0))); @@ -643,7 +642,7 @@ void SimulcastTestFixtureImpl::SwitchingToOneStream(int width, int height) { VideoFrameType::kVideoFrameKey), Field(&EncodedImage::_encodedWidth, width), Field(&EncodedImage::_encodedHeight, height)), - _, _)) + _)) .Times(1) .WillRepeatedly(Return( EncodedImageCallback::Result(EncodedImageCallback::Result::OK, 0))); @@ -866,12 +865,11 @@ void SimulcastTestFixtureImpl::TestDecodeWidthHeightSet() { encoder_->RegisterEncodeCompleteCallback(&encoder_callback); decoder_->RegisterDecodeCompleteCallback(&decoder_callback); - EXPECT_CALL(encoder_callback, OnEncodedImage(_, _, _)) + EXPECT_CALL(encoder_callback, OnEncodedImage(_, _)) .Times(3) .WillRepeatedly( ::testing::Invoke([&](const EncodedImage& encoded_image, - const CodecSpecificInfo* codec_specific_info, - const RTPFragmentationHeader* fragmentation) { + const CodecSpecificInfo* codec_specific_info) { EXPECT_EQ(encoded_image._frameType, VideoFrameType::kVideoFrameKey); size_t index = encoded_image.SpatialIndex().value_or(0);