From b859b326ba852727a99fe8920201daf29e5f1f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 7 Mar 2019 12:40:01 +0100 Subject: [PATCH] Update more VideoEncoder implementations to drop CodecSpecificInfo input MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup to https://webrtc-review.googlesource.com/c/src/+/125900. Bug: webrtc:10379 Change-Id: If81c50c862bbcfd65a3cf7000c8327ebafe519c3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126002 Commit-Queue: Niels Moller Reviewed-by: Erik Språng Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#27016} --- api/test/mock_video_encoder.h | 3 +- ...oder_software_fallback_wrapper_unittest.cc | 1 - .../encoder_simulcast_proxy_unittest.cc | 3 +- media/engine/fake_webrtc_video_engine.cc | 1 - media/engine/fake_webrtc_video_engine.h | 1 - .../simulcast_encoder_adapter_unittest.cc | 31 +++++++++---------- .../codecs/h264/h264_encoder_impl.cc | 1 - .../codecs/h264/h264_encoder_impl.h | 1 - .../codecs/test/videoprocessor_unittest.cc | 8 ++--- .../codecs/vp8/libvpx_vp8_encoder.cc | 1 - .../codecs/vp8/libvpx_vp8_encoder.h | 1 - .../codecs/vp8/test/vp8_impl_unittest.cc | 2 +- modules/video_coding/codecs/vp9/vp9_impl.cc | 1 - modules/video_coding/codecs/vp9/vp9_impl.h | 1 - test/configurable_frame_size_encoder.cc | 1 - test/configurable_frame_size_encoder.h | 1 - test/fake_encoder.cc | 21 +++---------- test/fake_encoder.h | 4 --- video/end_to_end_tests/network_state_tests.cc | 12 ++----- video/video_send_stream_tests.cc | 4 --- video/video_stream_encoder_unittest.cc | 6 ++-- 21 files changed, 32 insertions(+), 73 deletions(-) diff --git a/api/test/mock_video_encoder.h b/api/test/mock_video_encoder.h index 15e39142a1..d4f7baf99d 100644 --- a/api/test/mock_video_encoder.h +++ b/api/test/mock_video_encoder.h @@ -37,9 +37,8 @@ class MockVideoEncoder : public VideoEncoder { int32_t(const VideoCodec* codecSettings, int32_t numberOfCores, size_t maxPayloadSize)); - MOCK_METHOD3(Encode, + MOCK_METHOD2(Encode, int32_t(const VideoFrame& inputImage, - const CodecSpecificInfo* codecSpecificInfo, const std::vector* frame_types)); MOCK_METHOD1(RegisterEncodeCompleteCallback, int32_t(EncodedImageCallback* callback)); diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc index ec861dde3c..5ebd86ffe9 100644 --- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc +++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc @@ -94,7 +94,6 @@ class VideoEncoderSoftwareFallbackWrapperTest : public ::testing::Test { return init_encode_return_code_; } int32_t Encode(const VideoFrame& frame, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override { ++encode_count_; if (encode_complete_callback_ && diff --git a/media/engine/encoder_simulcast_proxy_unittest.cc b/media/engine/encoder_simulcast_proxy_unittest.cc index 62e215d320..a283ea5477 100644 --- a/media/engine/encoder_simulcast_proxy_unittest.cc +++ b/media/engine/encoder_simulcast_proxy_unittest.cc @@ -44,10 +44,9 @@ class MockEncoder : public VideoEncoder { MOCK_METHOD0(Release, int32_t()); - MOCK_METHOD3( + MOCK_METHOD2( Encode, int32_t(const VideoFrame& inputImage, - const CodecSpecificInfo* codecSpecificInfo, const std::vector* frame_types) /* override */); MOCK_CONST_METHOD0(GetEncoderInfo, VideoEncoder::EncoderInfo(void)); diff --git a/media/engine/fake_webrtc_video_engine.cc b/media/engine/fake_webrtc_video_engine.cc index f275fd3d13..d4de300e0d 100644 --- a/media/engine/fake_webrtc_video_engine.cc +++ b/media/engine/fake_webrtc_video_engine.cc @@ -150,7 +150,6 @@ int32_t FakeWebRtcVideoEncoder::InitEncode( int32_t FakeWebRtcVideoEncoder::Encode( const webrtc::VideoFrame& inputImage, - const webrtc::CodecSpecificInfo* codecSpecificInfo, const std::vector* frame_types) { rtc::CritScope lock(&crit_); ++num_frames_encoded_; diff --git a/media/engine/fake_webrtc_video_engine.h b/media/engine/fake_webrtc_video_engine.h index 08c7bb9fcd..3ab924aca4 100644 --- a/media/engine/fake_webrtc_video_engine.h +++ b/media/engine/fake_webrtc_video_engine.h @@ -90,7 +90,6 @@ class FakeWebRtcVideoEncoder : public webrtc::VideoEncoder { size_t maxPayloadSize) override; int32_t Encode( const webrtc::VideoFrame& inputImage, - const webrtc::CodecSpecificInfo* codecSpecificInfo, const std::vector* frame_types) override; int32_t RegisterEncodeCompleteCallback( webrtc::EncodedImageCallback* callback) override; diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc index 147fe8b3bf..96349455ea 100644 --- a/media/engine/simulcast_encoder_adapter_unittest.cc +++ b/media/engine/simulcast_encoder_adapter_unittest.cc @@ -194,10 +194,9 @@ class MockVideoEncoder : public VideoEncoder { return init_encode_return_value_; } - MOCK_METHOD3( + MOCK_METHOD2( Encode, int32_t(const VideoFrame& inputImage, - const CodecSpecificInfo* codecSpecificInfo, const std::vector* frame_types) /* override */); int32_t RegisterEncodeCompleteCallback( @@ -567,11 +566,11 @@ TEST_F(TestSimulcastEncoderAdapterFake, ReusesEncodersInOrder) { std::vector original_encoders = helper_->factory()->encoders(); ASSERT_EQ(3u, original_encoders.size()); - EXPECT_CALL(*original_encoders[0], Encode(_, _, _)) + EXPECT_CALL(*original_encoders[0], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_OK)); - EXPECT_CALL(*original_encoders[1], Encode(_, _, _)) + EXPECT_CALL(*original_encoders[1], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_OK)); - EXPECT_CALL(*original_encoders[2], Encode(_, _, _)) + EXPECT_CALL(*original_encoders[2], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_OK)); frame_types.resize(3, kVideoFrameKey); EXPECT_EQ(0, adapter_->Encode(input_frame, &frame_types)); @@ -593,10 +592,10 @@ TEST_F(TestSimulcastEncoderAdapterFake, ReusesEncodersInOrder) { std::vector new_encoders = helper_->factory()->encoders(); ASSERT_EQ(2u, new_encoders.size()); ASSERT_EQ(original_encoders[0], new_encoders[0]); - EXPECT_CALL(*original_encoders[0], Encode(_, _, _)) + EXPECT_CALL(*original_encoders[0], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_OK)); ASSERT_EQ(original_encoders[1], new_encoders[1]); - EXPECT_CALL(*original_encoders[1], Encode(_, _, _)) + EXPECT_CALL(*original_encoders[1], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_OK)); frame_types.resize(2, kVideoFrameKey); EXPECT_EQ(0, adapter_->Encode(input_frame, &frame_types)); @@ -616,7 +615,7 @@ TEST_F(TestSimulcastEncoderAdapterFake, ReusesEncodersInOrder) { new_encoders = helper_->factory()->encoders(); ASSERT_EQ(1u, new_encoders.size()); ASSERT_EQ(original_encoders[0], new_encoders[0]); - EXPECT_CALL(*original_encoders[0], Encode(_, _, _)) + EXPECT_CALL(*original_encoders[0], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_OK)); frame_types.resize(1, kVideoFrameKey); EXPECT_EQ(0, adapter_->Encode(input_frame, &frame_types)); @@ -635,12 +634,12 @@ TEST_F(TestSimulcastEncoderAdapterFake, ReusesEncodersInOrder) { ASSERT_EQ(3u, new_encoders.size()); // The first encoder is reused. ASSERT_EQ(original_encoders[0], new_encoders[0]); - EXPECT_CALL(*original_encoders[0], Encode(_, _, _)) + EXPECT_CALL(*original_encoders[0], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_OK)); // The second and third encoders are new. - EXPECT_CALL(*new_encoders[1], Encode(_, _, _)) + EXPECT_CALL(*new_encoders[1], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_OK)); - EXPECT_CALL(*new_encoders[2], Encode(_, _, _)) + EXPECT_CALL(*new_encoders[2], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_OK)); frame_types.resize(3, kVideoFrameKey); EXPECT_EQ(0, adapter_->Encode(input_frame, &frame_types)); @@ -889,7 +888,7 @@ TEST_F(TestSimulcastEncoderAdapterFake, // Expect calls with the given video frame verbatim, since it's a texture // frame and can't otherwise be modified/resized. for (MockVideoEncoder* encoder : helper_->factory()->encoders()) - EXPECT_CALL(*encoder, Encode(::testing::Ref(input_frame), _, _)).Times(1); + EXPECT_CALL(*encoder, Encode(::testing::Ref(input_frame), _)).Times(1); std::vector frame_types(3, kVideoFrameKey); EXPECT_EQ(0, adapter_->Encode(input_frame, &frame_types)); } @@ -903,7 +902,7 @@ TEST_F(TestSimulcastEncoderAdapterFake, TestFailureReturnCodesFromEncodeCalls) { adapter_->RegisterEncodeCompleteCallback(this); ASSERT_EQ(3u, helper_->factory()->encoders().size()); // Tell the 2nd encoder to request software fallback. - EXPECT_CALL(*helper_->factory()->encoders()[1], Encode(_, _, _)) + EXPECT_CALL(*helper_->factory()->encoders()[1], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE)); // Send a fake frame and assert the return is software fallback. @@ -1026,10 +1025,10 @@ TEST_F(TestSimulcastEncoderAdapterFake, ActivatesCorrectStreamsInInitEncode) { helper_->factory()->encoders(); ASSERT_EQ(3u, original_encoders.size()); // Only first encoder will be active and called. - EXPECT_CALL(*original_encoders[0], Encode(_, _, _)) + EXPECT_CALL(*original_encoders[0], Encode(_, _)) .WillOnce(Return(WEBRTC_VIDEO_CODEC_OK)); - EXPECT_CALL(*original_encoders[1], Encode(_, _, _)).Times(0); - EXPECT_CALL(*original_encoders[2], Encode(_, _, _)).Times(0); + EXPECT_CALL(*original_encoders[1], Encode(_, _)).Times(0); + EXPECT_CALL(*original_encoders[2], Encode(_, _)).Times(0); std::vector frame_types; frame_types.resize(3, kVideoFrameKey); diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc index 1800b9ed68..e641baefe6 100644 --- a/modules/video_coding/codecs/h264/h264_encoder_impl.cc +++ b/modules/video_coding/codecs/h264/h264_encoder_impl.cc @@ -383,7 +383,6 @@ int32_t H264EncoderImpl::SetRateAllocation( int32_t H264EncoderImpl::Encode( const VideoFrame& input_frame, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) { if (encoders_.empty()) { ReportError(); diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.h b/modules/video_coding/codecs/h264/h264_encoder_impl.h index 36a7f021bb..d0cde34c65 100644 --- a/modules/video_coding/codecs/h264/h264_encoder_impl.h +++ b/modules/video_coding/codecs/h264/h264_encoder_impl.h @@ -67,7 +67,6 @@ class H264EncoderImpl : public H264Encoder { // The result of encoding - an EncodedImage and RTPFragmentationHeader - are // passed to the encode complete callback. int32_t Encode(const VideoFrame& frame, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override; EncoderInfo GetEncoderInfo() const override; diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc index c668f413e3..dbf8300d77 100644 --- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -105,13 +105,13 @@ TEST_F(VideoProcessorTest, ProcessFrames_FixedFramerate) { .WillRepeatedly(Return(I420Buffer::Create(kWidth, kHeight))); EXPECT_CALL( encoder_mock_, - Encode(Property(&VideoFrame::timestamp, 1 * 90000 / kFramerateFps), _, _)) + Encode(Property(&VideoFrame::timestamp, 1 * 90000 / kFramerateFps), _)) .Times(1); q_.SendTask([this] { video_processor_->ProcessFrame(); }); EXPECT_CALL( encoder_mock_, - Encode(Property(&VideoFrame::timestamp, 2 * 90000 / kFramerateFps), _, _)) + Encode(Property(&VideoFrame::timestamp, 2 * 90000 / kFramerateFps), _)) .Times(1); q_.SendTask([this] { video_processor_->ProcessFrame(); }); @@ -131,7 +131,7 @@ TEST_F(VideoProcessorTest, ProcessFrames_VariableFramerate) { EXPECT_CALL(frame_reader_mock_, ReadFrame()) .WillRepeatedly(Return(I420Buffer::Create(kWidth, kHeight))); EXPECT_CALL(encoder_mock_, - Encode(Property(&VideoFrame::timestamp, kStartTimestamp), _, _)) + Encode(Property(&VideoFrame::timestamp, kStartTimestamp), _)) .Times(1); q_.SendTask([this] { video_processor_->ProcessFrame(); }); @@ -145,7 +145,7 @@ TEST_F(VideoProcessorTest, ProcessFrames_VariableFramerate) { EXPECT_CALL(encoder_mock_, Encode(Property(&VideoFrame::timestamp, kStartTimestamp + 90000 / kNewFramerateFps), - _, _)) + _)) .Times(1); q_.SendTask([this] { video_processor_->ProcessFrame(); }); diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc index 94b079fef4..4eedb85cb9 100644 --- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc +++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc @@ -736,7 +736,6 @@ size_t LibvpxVp8Encoder::SteadyStateSize(int sid, int tid) { } int LibvpxVp8Encoder::Encode(const VideoFrame& frame, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) { RTC_DCHECK_EQ(frame.width(), codec_.width); RTC_DCHECK_EQ(frame.height(), codec_.height); diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h index 271055907d..b0e1afb358 100644 --- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h +++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h @@ -46,7 +46,6 @@ class LibvpxVp8Encoder : public VideoEncoder { size_t max_payload_size) override; int Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override; int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override; diff --git a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc index 771471f415..05e2f05fd5 100644 --- a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc +++ b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc @@ -485,7 +485,7 @@ TEST_F(TestVp8Impl, KeepsTimestampOnReencode) { .WillRepeatedly(Return(vpx_codec_err_t::VPX_CODEC_OK)); auto delta_frame = std::vector{kVideoFrameDelta}; - encoder.Encode(*NextInputFrame(), nullptr, &delta_frame); + encoder.Encode(*NextInputFrame(), &delta_frame); } TEST_F(TestVp8Impl, GetEncoderInfoFpsAllocationNoLayers) { diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc index 177c839fe1..e39e9bbbe1 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -713,7 +713,6 @@ uint32_t VP9EncoderImpl::MaxIntraTarget(uint32_t optimal_buffer_size) { } int VP9EncoderImpl::Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) { if (!inited_) { return WEBRTC_VIDEO_CODEC_UNINITIALIZED; diff --git a/modules/video_coding/codecs/vp9/vp9_impl.h b/modules/video_coding/codecs/vp9/vp9_impl.h index 62aeeb577d..3fc5398c53 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.h +++ b/modules/video_coding/codecs/vp9/vp9_impl.h @@ -44,7 +44,6 @@ class VP9EncoderImpl : public VP9Encoder { size_t max_payload_size) override; int Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override; int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override; diff --git a/test/configurable_frame_size_encoder.cc b/test/configurable_frame_size_encoder.cc index 40b99079b2..2c65c3893b 100644 --- a/test/configurable_frame_size_encoder.cc +++ b/test/configurable_frame_size_encoder.cc @@ -45,7 +45,6 @@ int32_t ConfigurableFrameSizeEncoder::InitEncode( int32_t ConfigurableFrameSizeEncoder::Encode( const VideoFrame& inputImage, - const CodecSpecificInfo* codecSpecificInfo, const std::vector* frame_types) { EncodedImage encodedImage(buffer_.get(), current_frame_size_, max_frame_size_); diff --git a/test/configurable_frame_size_encoder.h b/test/configurable_frame_size_encoder.h index 6b8ca96c73..25dcaf991f 100644 --- a/test/configurable_frame_size_encoder.h +++ b/test/configurable_frame_size_encoder.h @@ -38,7 +38,6 @@ class ConfigurableFrameSizeEncoder : public VideoEncoder { size_t max_payload_size) override; int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override; int32_t RegisterEncodeCompleteCallback( diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc index 5e7131cdb7..2e9ac5e794 100644 --- a/test/fake_encoder.cc +++ b/test/fake_encoder.cc @@ -81,7 +81,6 @@ int32_t FakeEncoder::InitEncode(const VideoCodec* config, } int32_t FakeEncoder::Encode(const VideoFrame& input_image, - const CodecSpecificInfo* /*codec_specific_info*/, const std::vector* frame_types) { unsigned char max_framerate; unsigned char num_simulcast_streams; @@ -355,13 +354,12 @@ void DelayedEncoder::SetDelay(int delay_ms) { } int32_t DelayedEncoder::Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) { RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_); SleepMs(delay_ms_); - return FakeEncoder::Encode(input_image, codec_specific_info, frame_types); + return FakeEncoder::Encode(input_image, frame_types); } MultithreadedFakeH264Encoder::MultithreadedFakeH264Encoder(Clock* clock) @@ -389,32 +387,24 @@ class MultithreadedFakeH264Encoder::EncodeTask : public rtc::QueuedTask { public: EncodeTask(MultithreadedFakeH264Encoder* encoder, const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) : encoder_(encoder), input_image_(input_image), - codec_specific_info_(), - frame_types_(*frame_types) { - if (codec_specific_info) - codec_specific_info_ = *codec_specific_info; - } + frame_types_(*frame_types) {} private: bool Run() override { - encoder_->EncodeCallback(input_image_, &codec_specific_info_, - &frame_types_); + encoder_->EncodeCallback(input_image_, &frame_types_); return true; } MultithreadedFakeH264Encoder* const encoder_; VideoFrame input_image_; - CodecSpecificInfo codec_specific_info_; std::vector frame_types_; }; int32_t MultithreadedFakeH264Encoder::Encode( const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) { RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_); @@ -426,16 +416,15 @@ int32_t MultithreadedFakeH264Encoder::Encode( } queue->PostTask(std::unique_ptr( - new EncodeTask(this, input_image, codec_specific_info, frame_types))); + new EncodeTask(this, input_image, frame_types))); return WEBRTC_VIDEO_CODEC_OK; } int32_t MultithreadedFakeH264Encoder::EncodeCallback( const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) { - return FakeH264Encoder::Encode(input_image, codec_specific_info, frame_types); + return FakeH264Encoder::Encode(input_image, frame_types); } int32_t MultithreadedFakeH264Encoder::Release() { diff --git a/test/fake_encoder.h b/test/fake_encoder.h index 3a4008363e..0e99dc5ff5 100644 --- a/test/fake_encoder.h +++ b/test/fake_encoder.h @@ -45,7 +45,6 @@ class FakeEncoder : public VideoEncoder { int32_t number_of_cores, size_t max_payload_size) override; int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override; int32_t RegisterEncodeCompleteCallback( EncodedImageCallback* callback) override; @@ -125,7 +124,6 @@ class DelayedEncoder : public test::FakeEncoder { void SetDelay(int delay_ms); int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override; private: @@ -147,11 +145,9 @@ class MultithreadedFakeH264Encoder : public test::FakeH264Encoder { size_t max_payload_size) override; int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override; int32_t EncodeCallback(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types); int32_t Release() override; diff --git a/video/end_to_end_tests/network_state_tests.cc b/video/end_to_end_tests/network_state_tests.cc index 5ba38d9874..a863076437 100644 --- a/video/end_to_end_tests/network_state_tests.cc +++ b/video/end_to_end_tests/network_state_tests.cc @@ -268,7 +268,6 @@ TEST_F(NetworkStateEndToEndTest, RespectsNetworkState) { } int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override { { rtc::CritScope lock(&test_crit_); @@ -282,8 +281,7 @@ TEST_F(NetworkStateEndToEndTest, RespectsNetworkState) { encoded_frames_.Set(); } } - return test::FakeEncoder::Encode(input_image, codec_specific_info, - frame_types); + return test::FakeEncoder::Encode(input_image, frame_types); } private: @@ -364,11 +362,9 @@ TEST_F(NetworkStateEndToEndTest, NewVideoSendStreamsRespectVideoNetworkDown) { return 0; } int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override { ADD_FAILURE() << "Unexpected frame encode."; - return test::FakeEncoder::Encode(input_image, codec_specific_info, - frame_types); + return test::FakeEncoder::Encode(input_image, frame_types); } }; @@ -389,11 +385,9 @@ TEST_F(NetworkStateEndToEndTest, NewVideoSendStreamsIgnoreAudioNetworkDown) { } } int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override { encoded_frame_ = true; - return test::FakeEncoder::Encode(input_image, codec_specific_info, - frame_types); + return test::FakeEncoder::Encode(input_image, frame_types); } private: diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc index fe562d5143..1b5c643fc8 100644 --- a/video/video_send_stream_tests.cc +++ b/video/video_send_stream_tests.cc @@ -1983,7 +1983,6 @@ TEST_F(VideoSendStreamTest, } int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override { ADD_FAILURE() << "Unexpected Encode call since the send stream is not started"; @@ -2317,7 +2316,6 @@ TEST_F(VideoSendStreamTest, EncoderIsProperlyInitializedAndDestroyed) { } int32_t Encode(const VideoFrame& inputImage, - const CodecSpecificInfo* codecSpecificInfo, const std::vector* frame_types) override { EXPECT_TRUE(IsReadyForEncode()); @@ -2536,7 +2534,6 @@ class VideoCodecConfigObserver : public test::SendTest, } int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override { // Silently skip the encode, FakeEncoder::Encode doesn't produce VP8. return 0; @@ -3002,7 +2999,6 @@ TEST_F(VideoSendStreamTest, ReportsSentResolution) { private: int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codecSpecificInfo, const std::vector* frame_types) override { CodecSpecificInfo specifics; specifics.codecType = kVideoCodecGeneric; diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc index 8b4084aa53..86b2f0eeef 100644 --- a/video/video_stream_encoder_unittest.cc +++ b/video/video_stream_encoder_unittest.cc @@ -618,7 +618,7 @@ class VideoStreamEncoderTest : public ::testing::Test { rtc::CritScope lock(&local_crit_sect_); last_frame_types_ = frame_type; } - FakeEncoder::Encode(input_image, nullptr, &frame_type); + FakeEncoder::Encode(input_image, &frame_type); } void InjectEncodedImage(const EncodedImage& image) { @@ -639,7 +639,6 @@ class VideoStreamEncoderTest : public ::testing::Test { private: int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override { bool block_encode; { @@ -664,8 +663,7 @@ class VideoStreamEncoderTest : public ::testing::Test { last_update_rect_ = input_image.update_rect(); last_frame_types_ = *frame_types; } - int32_t result = - FakeEncoder::Encode(input_image, codec_specific_info, frame_types); + int32_t result = FakeEncoder::Encode(input_image, frame_types); if (block_encode) EXPECT_TRUE(continue_encode_event_.Wait(kDefaultTimeoutMs)); return result;