From 18c83d3f0b12e3879451f71bd02df8abdf25b803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 7 Aug 2020 14:14:49 +0200 Subject: [PATCH] Delete unused argument |require_key_frame| Bug: webrtc:7408 Change-Id: I59e73e6c54de5b2d293b83d54556e3d3fc6180f4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181073 Reviewed-by: Ilya Nikolaevskiy Reviewed-by: Philip Eliasson Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#31884} --- modules/video_coding/decoder_database.cc | 15 +++++---------- modules/video_coding/decoder_database.h | 8 ++------ modules/video_coding/include/video_coding.h | 3 +-- modules/video_coding/video_coding_impl.cc | 6 ++---- modules/video_coding/video_coding_impl.h | 3 +-- modules/video_coding/video_receiver.cc | 6 ++---- modules/video_coding/video_receiver2.cc | 6 ++---- modules/video_coding/video_receiver2.h | 3 +-- modules/video_coding/video_receiver_unittest.cc | 2 +- video/video_receive_stream.cc | 4 ++-- video/video_receive_stream2.cc | 4 ++-- 11 files changed, 21 insertions(+), 39 deletions(-) diff --git a/modules/video_coding/decoder_database.cc b/modules/video_coding/decoder_database.cc index 38a18baa6d..da3a87bdcc 100644 --- a/modules/video_coding/decoder_database.cc +++ b/modules/video_coding/decoder_database.cc @@ -15,12 +15,8 @@ namespace webrtc { -VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings, - int number_of_cores, - bool require_key_frame) - : settings(settings), - number_of_cores(number_of_cores), - require_key_frame(require_key_frame) { +VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings, int number_of_cores) + : settings(settings), number_of_cores(number_of_cores) { RTC_DCHECK_GE(number_of_cores, 0); } @@ -75,16 +71,15 @@ void VCMDecoderDataBase::RegisterExternalDecoder(VideoDecoder* external_decoder, } bool VCMDecoderDataBase::RegisterReceiveCodec(const VideoCodec* receive_codec, - int number_of_cores, - bool require_key_frame) { + int number_of_cores) { if (number_of_cores < 0) { return false; } // If payload value already exists, erase old and insert new. DeregisterReceiveCodec(receive_codec->plType); VideoCodec* new_receive_codec = new VideoCodec(*receive_codec); - dec_map_[receive_codec->plType] = new VCMDecoderMapItem( - new_receive_codec, number_of_cores, require_key_frame); + dec_map_[receive_codec->plType] = + new VCMDecoderMapItem(new_receive_codec, number_of_cores); return true; } diff --git a/modules/video_coding/decoder_database.h b/modules/video_coding/decoder_database.h index 8c96b41efd..ef1b2d31e8 100644 --- a/modules/video_coding/decoder_database.h +++ b/modules/video_coding/decoder_database.h @@ -20,14 +20,11 @@ namespace webrtc { struct VCMDecoderMapItem { public: - VCMDecoderMapItem(VideoCodec* settings, - int number_of_cores, - bool require_key_frame); + VCMDecoderMapItem(VideoCodec* settings, int number_of_cores); ~VCMDecoderMapItem(); std::unique_ptr settings; int number_of_cores; - bool require_key_frame; }; struct VCMExtDecoderMapItem { @@ -49,8 +46,7 @@ class VCMDecoderDataBase { uint8_t payload_type); bool RegisterReceiveCodec(const VideoCodec* receive_codec, - int number_of_cores, - bool require_key_frame); + int number_of_cores); bool DeregisterReceiveCodec(uint8_t payload_type); // Returns a decoder specified by frame.PayloadType. The decoded frame diff --git a/modules/video_coding/include/video_coding.h b/modules/video_coding/include/video_coding.h index acaa73bbf2..21a5219836 100644 --- a/modules/video_coding/include/video_coding.h +++ b/modules/video_coding/include/video_coding.h @@ -53,8 +53,7 @@ class VideoCodingModule : public Module { // Return value : VCM_OK, on success. // < 0, on error. virtual int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec, - int32_t numberOfCores, - bool requireKeyFrame = false) = 0; + int32_t numberOfCores) = 0; // Register an external decoder object. // diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc index 829a3f0c11..fd87ad9acf 100644 --- a/modules/video_coding/video_coding_impl.cc +++ b/modules/video_coding/video_coding_impl.cc @@ -57,10 +57,8 @@ class VideoCodingModuleImpl : public VideoCodingModule { void Process() override { receiver_.Process(); } int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec, - int32_t numberOfCores, - bool requireKeyFrame) override { - return receiver_.RegisterReceiveCodec(receiveCodec, numberOfCores, - requireKeyFrame); + int32_t numberOfCores) override { + return receiver_.RegisterReceiveCodec(receiveCodec, numberOfCores); } void RegisterExternalDecoder(VideoDecoder* externalDecoder, diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h index 440d1998bc..0a872addd7 100644 --- a/modules/video_coding/video_coding_impl.h +++ b/modules/video_coding/video_coding_impl.h @@ -61,8 +61,7 @@ class VideoReceiver : public Module { ~VideoReceiver() override; int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec, - int32_t numberOfCores, - bool requireKeyFrame); + int32_t numberOfCores); void RegisterExternalDecoder(VideoDecoder* externalDecoder, uint8_t payloadType); diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc index a227a8c337..a5491e9a40 100644 --- a/modules/video_coding/video_receiver.cc +++ b/modules/video_coding/video_receiver.cc @@ -251,14 +251,12 @@ int32_t VideoReceiver::Decode(const VCMEncodedFrame& frame) { // Register possible receive codecs, can be called multiple times int32_t VideoReceiver::RegisterReceiveCodec(const VideoCodec* receiveCodec, - int32_t numberOfCores, - bool requireKeyFrame) { + int32_t numberOfCores) { RTC_DCHECK_RUN_ON(&construction_thread_checker_); if (receiveCodec == nullptr) { return VCM_PARAMETER_ERROR; } - if (!_codecDataBase.RegisterReceiveCodec(receiveCodec, numberOfCores, - requireKeyFrame)) { + if (!_codecDataBase.RegisterReceiveCodec(receiveCodec, numberOfCores)) { return -1; } return 0; diff --git a/modules/video_coding/video_receiver2.cc b/modules/video_coding/video_receiver2.cc index 8eaefbb8da..5ffb4f276e 100644 --- a/modules/video_coding/video_receiver2.cc +++ b/modules/video_coding/video_receiver2.cc @@ -96,15 +96,13 @@ int32_t VideoReceiver2::Decode(const VCMEncodedFrame* frame) { // Register possible receive codecs, can be called multiple times int32_t VideoReceiver2::RegisterReceiveCodec(const VideoCodec* receiveCodec, - int32_t numberOfCores, - bool requireKeyFrame) { + int32_t numberOfCores) { RTC_DCHECK_RUN_ON(&construction_thread_checker_); RTC_DCHECK(!IsDecoderThreadRunning()); if (receiveCodec == nullptr) { return VCM_PARAMETER_ERROR; } - if (!codecDataBase_.RegisterReceiveCodec(receiveCodec, numberOfCores, - requireKeyFrame)) { + if (!codecDataBase_.RegisterReceiveCodec(receiveCodec, numberOfCores)) { return -1; } return 0; diff --git a/modules/video_coding/video_receiver2.h b/modules/video_coding/video_receiver2.h index 202072a560..d9f02e98bf 100644 --- a/modules/video_coding/video_receiver2.h +++ b/modules/video_coding/video_receiver2.h @@ -31,8 +31,7 @@ class VideoReceiver2 { ~VideoReceiver2(); int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec, - int32_t numberOfCores, - bool requireKeyFrame); + int32_t numberOfCores); void RegisterExternalDecoder(VideoDecoder* externalDecoder, uint8_t payloadType); diff --git a/modules/video_coding/video_receiver_unittest.cc b/modules/video_coding/video_receiver_unittest.cc index 2872c8d2a9..43a05eaf3b 100644 --- a/modules/video_coding/video_receiver_unittest.cc +++ b/modules/video_coding/video_receiver_unittest.cc @@ -58,7 +58,7 @@ class TestVideoReceiver : public ::testing::Test { receiver_.RegisterExternalDecoder(&decoder_, kUnusedPayloadType); webrtc::test::CodecSettings(kVideoCodecVP8, &settings_); settings_.plType = kUnusedPayloadType; - EXPECT_EQ(0, receiver_.RegisterReceiveCodec(&settings_, 1, true)); + EXPECT_EQ(0, receiver_.RegisterReceiveCodec(&settings_, 1)); // Set protection mode. const size_t kMaxNackListSize = 250; diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index 1aa2f4c47d..8fd0a29fa1 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -375,8 +375,8 @@ void VideoReceiveStream::Start() { config_.rtp.raw_payload_types.count(codec.plType) > 0; rtp_video_stream_receiver_.AddReceiveCodec( codec, decoder.video_format.parameters, raw_payload); - RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec( - &codec, num_cpu_cores_, false)); + RTC_CHECK_EQ(VCM_OK, + video_receiver_.RegisterReceiveCodec(&codec, num_cpu_cores_)); } RTC_DCHECK(renderer != nullptr); diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc index 0cb3c47096..cf9c61cf58 100644 --- a/video/video_receive_stream2.cc +++ b/video/video_receive_stream2.cc @@ -351,8 +351,8 @@ void VideoReceiveStream2::Start() { config_.rtp.raw_payload_types.count(codec.plType) > 0; rtp_video_stream_receiver_.AddReceiveCodec( codec, decoder.video_format.parameters, raw_payload); - RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec( - &codec, num_cpu_cores_, false)); + RTC_CHECK_EQ(VCM_OK, + video_receiver_.RegisterReceiveCodec(&codec, num_cpu_cores_)); } RTC_DCHECK(renderer != nullptr);