From c4024d62a4944ddb2088c6d2798784b43507a696 Mon Sep 17 00:00:00 2001 From: Dor Hen Date: Sun, 27 Oct 2024 14:24:44 +0200 Subject: [PATCH] Comment unused variables in implemented functions 6\n Bug: webrtc:370878648 Change-Id: Ied495f832ae93da4c7dfdb8d0aca2913cb15794e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/366203 Commit-Queue: Dor Hen Reviewed-by: Danil Chapovalov Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#43314} --- api/audio_codecs/L16/audio_decoder_L16.cc | 2 +- api/audio_codecs/L16/audio_encoder_L16.cc | 2 +- .../audio_decoder_factory_template.h | 15 ++++++----- .../audio_encoder_factory_template.h | 13 +++++----- .../builtin_audio_decoder_factory.cc | 3 ++- .../builtin_audio_encoder_factory.cc | 3 ++- api/audio_codecs/g711/audio_decoder_g711.cc | 2 +- api/audio_codecs/g711/audio_encoder_g711.cc | 2 +- api/audio_codecs/g722/audio_decoder_g722.cc | 2 +- api/audio_codecs/g722/audio_encoder_g722.cc | 2 +- .../opus/audio_decoder_multi_channel_opus.cc | 2 +- .../opus/audio_encoder_multi_channel_opus.cc | 2 +- .../opus_audio_decoder_factory.cc | 3 ++- .../opus_audio_encoder_factory.cc | 3 ++- ...audio_decoder_factory_template_unittest.cc | 17 +++++++------ ...audio_encoder_factory_template_unittest.cc | 25 ++++++++++--------- api/data_channel_interface.cc | 6 ++--- api/data_channel_interface.h | 2 +- api/environment/environment_factory.h | 2 +- api/environment/environment_unittest.cc | 4 ++- 20 files changed, 62 insertions(+), 50 deletions(-) diff --git a/api/audio_codecs/L16/audio_decoder_L16.cc b/api/audio_codecs/L16/audio_decoder_L16.cc index a84aa1c8be..162a9b91d2 100644 --- a/api/audio_codecs/L16/audio_decoder_L16.cc +++ b/api/audio_codecs/L16/audio_decoder_L16.cc @@ -44,7 +44,7 @@ void AudioDecoderL16::AppendSupportedDecoders( std::unique_ptr AudioDecoderL16::MakeAudioDecoder( const Config& config, std::optional /*codec_pair_id*/, - const FieldTrialsView* field_trials) { + const FieldTrialsView* /* field_trials */) { if (!config.IsOk()) { return nullptr; } diff --git a/api/audio_codecs/L16/audio_encoder_L16.cc b/api/audio_codecs/L16/audio_encoder_L16.cc index 3bc32415fd..3bbaa79ba9 100644 --- a/api/audio_codecs/L16/audio_encoder_L16.cc +++ b/api/audio_codecs/L16/audio_encoder_L16.cc @@ -71,7 +71,7 @@ std::unique_ptr AudioEncoderL16::MakeAudioEncoder( const AudioEncoderL16::Config& config, int payload_type, std::optional /*codec_pair_id*/, - const FieldTrialsView* field_trials) { + const FieldTrialsView* /* field_trials */) { AudioEncoderPcm16B::Config c; c.sample_rate_hz = config.sample_rate_hz; c.num_channels = config.num_channels; diff --git a/api/audio_codecs/audio_decoder_factory_template.h b/api/audio_codecs/audio_decoder_factory_template.h index 257a6092b1..6cf0bee654 100644 --- a/api/audio_codecs/audio_decoder_factory_template.h +++ b/api/audio_codecs/audio_decoder_factory_template.h @@ -34,13 +34,16 @@ struct Helper; // Base case: 0 template parameters. template <> struct Helper<> { - static void AppendSupportedDecoders(std::vector* specs) {} - static bool IsSupportedDecoder(const SdpAudioFormat& format) { return false; } + static void AppendSupportedDecoders( + std::vector* /* specs */) {} + static bool IsSupportedDecoder(const SdpAudioFormat& /* format */) { + return false; + } static absl::Nullable> MakeAudioDecoder( - const Environment& env, - const SdpAudioFormat& format, - std::optional codec_pair_id) { + const Environment& /* env */, + const SdpAudioFormat& /* format */, + std::optional /* codec_pair_id */) { return nullptr; } }; @@ -72,7 +75,7 @@ template >>> absl::Nullable> CreateDecoder( Rank0, - const Environment& env, + const Environment& /* env */, const typename Trait::Config& config, std::optional codec_pair_id) { return Trait::MakeAudioDecoder(config, codec_pair_id); diff --git a/api/audio_codecs/audio_encoder_factory_template.h b/api/audio_codecs/audio_encoder_factory_template.h index 8b26330fe7..bab725d651 100644 --- a/api/audio_codecs/audio_encoder_factory_template.h +++ b/api/audio_codecs/audio_encoder_factory_template.h @@ -35,15 +35,16 @@ struct Helper; // Base case: 0 template parameters. template <> struct Helper<> { - static void AppendSupportedEncoders(std::vector* specs) {} + static void AppendSupportedEncoders( + std::vector* /* specs */) {} static std::optional QueryAudioEncoder( - const SdpAudioFormat& format) { + const SdpAudioFormat& /* format */) { return std::nullopt; } static absl::Nullable> CreateAudioEncoder( - const Environment& env, - const SdpAudioFormat& format, - const AudioEncoderFactory::Options& options) { + const Environment& /* env */, + const SdpAudioFormat& /* format */, + const AudioEncoderFactory::Options& /* options */) { return nullptr; } }; @@ -76,7 +77,7 @@ template >>> absl::Nullable> CreateEncoder( Rank0, - const Environment& env, + const Environment& /* env */, const typename Trait::Config& config, const AudioEncoderFactory::Options& options) { return Trait::MakeAudioEncoder(config, options.payload_type, diff --git a/api/audio_codecs/builtin_audio_decoder_factory.cc b/api/audio_codecs/builtin_audio_decoder_factory.cc index 643df54170..3e39d75d01 100644 --- a/api/audio_codecs/builtin_audio_decoder_factory.cc +++ b/api/audio_codecs/builtin_audio_decoder_factory.cc @@ -39,7 +39,8 @@ struct NotAdvertised { static std::optional SdpToConfig(const SdpAudioFormat& audio_format) { return T::SdpToConfig(audio_format); } - static void AppendSupportedDecoders(std::vector* specs) { + static void AppendSupportedDecoders( + std::vector* /* specs */) { // Don't advertise support for anything. } static std::unique_ptr MakeAudioDecoder( diff --git a/api/audio_codecs/builtin_audio_encoder_factory.cc b/api/audio_codecs/builtin_audio_encoder_factory.cc index 50a9baae2c..aea63490b0 100644 --- a/api/audio_codecs/builtin_audio_encoder_factory.cc +++ b/api/audio_codecs/builtin_audio_encoder_factory.cc @@ -40,7 +40,8 @@ struct NotAdvertised { static std::optional SdpToConfig(const SdpAudioFormat& audio_format) { return T::SdpToConfig(audio_format); } - static void AppendSupportedEncoders(std::vector* specs) { + static void AppendSupportedEncoders( + std::vector* /* specs */) { // Don't advertise support for anything. } static AudioCodecInfo QueryAudioEncoder(const Config& config) { diff --git a/api/audio_codecs/g711/audio_decoder_g711.cc b/api/audio_codecs/g711/audio_decoder_g711.cc index 724e09f865..e59dca66db 100644 --- a/api/audio_codecs/g711/audio_decoder_g711.cc +++ b/api/audio_codecs/g711/audio_decoder_g711.cc @@ -55,7 +55,7 @@ void AudioDecoderG711::AppendSupportedDecoders( std::unique_ptr AudioDecoderG711::MakeAudioDecoder( const Config& config, std::optional /*codec_pair_id*/, - const FieldTrialsView* field_trials) { + const FieldTrialsView* /* field_trials */) { if (!config.IsOk()) { RTC_DCHECK_NOTREACHED(); return nullptr; diff --git a/api/audio_codecs/g711/audio_encoder_g711.cc b/api/audio_codecs/g711/audio_encoder_g711.cc index aa0031801d..aa676a22c8 100644 --- a/api/audio_codecs/g711/audio_encoder_g711.cc +++ b/api/audio_codecs/g711/audio_encoder_g711.cc @@ -76,7 +76,7 @@ std::unique_ptr AudioEncoderG711::MakeAudioEncoder( const Config& config, int payload_type, std::optional /*codec_pair_id*/, - const FieldTrialsView* field_trials) { + const FieldTrialsView* /* field_trials */) { if (!config.IsOk()) { RTC_DCHECK_NOTREACHED(); return nullptr; diff --git a/api/audio_codecs/g722/audio_decoder_g722.cc b/api/audio_codecs/g722/audio_decoder_g722.cc index 2b8c4f7ecc..88581bbc2e 100644 --- a/api/audio_codecs/g722/audio_decoder_g722.cc +++ b/api/audio_codecs/g722/audio_decoder_g722.cc @@ -43,7 +43,7 @@ void AudioDecoderG722::AppendSupportedDecoders( std::unique_ptr AudioDecoderG722::MakeAudioDecoder( Config config, std::optional /*codec_pair_id*/, - const FieldTrialsView* field_trials) { + const FieldTrialsView* /* field_trials */) { if (!config.IsOk()) { RTC_DCHECK_NOTREACHED(); return nullptr; diff --git a/api/audio_codecs/g722/audio_encoder_g722.cc b/api/audio_codecs/g722/audio_encoder_g722.cc index 5ba9598bfd..6c932ef039 100644 --- a/api/audio_codecs/g722/audio_encoder_g722.cc +++ b/api/audio_codecs/g722/audio_encoder_g722.cc @@ -74,7 +74,7 @@ std::unique_ptr AudioEncoderG722::MakeAudioEncoder( const AudioEncoderG722Config& config, int payload_type, std::optional /*codec_pair_id*/, - const FieldTrialsView* field_trials) { + const FieldTrialsView* /* field_trials */) { if (!config.IsOk()) { RTC_DCHECK_NOTREACHED(); return nullptr; diff --git a/api/audio_codecs/opus/audio_decoder_multi_channel_opus.cc b/api/audio_codecs/opus/audio_decoder_multi_channel_opus.cc index a9381c0353..5c904019ec 100644 --- a/api/audio_codecs/opus/audio_decoder_multi_channel_opus.cc +++ b/api/audio_codecs/opus/audio_decoder_multi_channel_opus.cc @@ -69,7 +69,7 @@ void AudioDecoderMultiChannelOpus::AppendSupportedDecoders( std::unique_ptr AudioDecoderMultiChannelOpus::MakeAudioDecoder( AudioDecoderMultiChannelOpusConfig config, std::optional /*codec_pair_id*/, - const FieldTrialsView* field_trials) { + const FieldTrialsView* /* field_trials */) { return AudioDecoderMultiChannelOpusImpl::MakeAudioDecoder(config); } } // namespace webrtc diff --git a/api/audio_codecs/opus/audio_encoder_multi_channel_opus.cc b/api/audio_codecs/opus/audio_encoder_multi_channel_opus.cc index ef0699b4b9..c2971ce296 100644 --- a/api/audio_codecs/opus/audio_encoder_multi_channel_opus.cc +++ b/api/audio_codecs/opus/audio_encoder_multi_channel_opus.cc @@ -67,7 +67,7 @@ std::unique_ptr AudioEncoderMultiChannelOpus::MakeAudioEncoder( const AudioEncoderMultiChannelOpusConfig& config, int payload_type, std::optional /*codec_pair_id*/, - const FieldTrialsView* field_trials) { + const FieldTrialsView* /* field_trials */) { return AudioEncoderMultiChannelOpusImpl::MakeAudioEncoder(config, payload_type); } diff --git a/api/audio_codecs/opus_audio_decoder_factory.cc b/api/audio_codecs/opus_audio_decoder_factory.cc index c3d5df4b30..b0ff3dd89d 100644 --- a/api/audio_codecs/opus_audio_decoder_factory.cc +++ b/api/audio_codecs/opus_audio_decoder_factory.cc @@ -34,7 +34,8 @@ struct NotAdvertised { static std::optional SdpToConfig(const SdpAudioFormat& audio_format) { return T::SdpToConfig(audio_format); } - static void AppendSupportedDecoders(std::vector* specs) { + static void AppendSupportedDecoders( + std::vector* /* specs */) { // Don't advertise support for anything. } static std::unique_ptr MakeAudioDecoder( diff --git a/api/audio_codecs/opus_audio_encoder_factory.cc b/api/audio_codecs/opus_audio_encoder_factory.cc index 164b7a16b4..0593ccc9a2 100644 --- a/api/audio_codecs/opus_audio_encoder_factory.cc +++ b/api/audio_codecs/opus_audio_encoder_factory.cc @@ -34,7 +34,8 @@ struct NotAdvertised { static std::optional SdpToConfig(const SdpAudioFormat& audio_format) { return T::SdpToConfig(audio_format); } - static void AppendSupportedEncoders(std::vector* specs) { + static void AppendSupportedEncoders( + std::vector* /* specs */) { // Don't advertise support for anything. } static AudioCodecInfo QueryAudioEncoder(const Config& config) { diff --git a/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc index 164c149302..7500557633 100644 --- a/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc +++ b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc @@ -93,7 +93,8 @@ struct BaseAudioDecoderApi { static SdpAudioFormat AudioFormat() { return {"fake", 16'000, 2, {}}; } - static std::optional SdpToConfig(const SdpAudioFormat& audio_format) { + static std::optional SdpToConfig( + const SdpAudioFormat& /* audio_format */) { return Config(); } @@ -110,17 +111,17 @@ struct TraitWithTwoMakeAudioDecoders : BaseAudioDecoderApi { static constexpr int kRateWithEnv = 20'000; static std::unique_ptr MakeAudioDecoder( - const Config& config, - std::optional codec_pair_id) { + const Config& /* config */, + std::optional /* codec_pair_id */) { auto decoder = std::make_unique>(); ON_CALL(*decoder, SampleRateHz).WillByDefault(Return(kRateWithoutEnv)); return decoder; } static std::unique_ptr MakeAudioDecoder( - const Environment& env, - const Config& config, - std::optional codec_pair_id) { + const Environment& /* env */, + const Config& /* config */, + std::optional /* codec_pair_id */) { auto decoder = std::make_unique>(); ON_CALL(*decoder, SampleRateHz).WillByDefault(Return(kRateWithEnv)); return decoder; @@ -139,8 +140,8 @@ TEST(AudioDecoderFactoryTemplateTest, struct AudioDecoderApiWithV1Make : BaseAudioDecoderApi { static std::unique_ptr MakeAudioDecoder( - const Config& config, - std::optional codec_pair_id) { + const Config& /* config */, + std::optional /* codec_pair_id */) { return std::make_unique>(); } }; diff --git a/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc index 67147ba860..a2f51af49a 100644 --- a/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc +++ b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc @@ -77,7 +77,7 @@ struct AudioEncoderFakeApi { static std::unique_ptr MakeAudioEncoder( const Config&, - int payload_type, + int /* payload_type */, std::optional /*codec_pair_id*/ = std::nullopt) { auto enc = std::make_unique>(); EXPECT_CALL(*enc, SampleRateHz()) @@ -99,7 +99,8 @@ struct BaseAudioEncoderApi { static SdpAudioFormat AudioFormat() { return {"fake", 16'000, 2, {}}; } static AudioCodecInfo CodecInfo() { return {16'000, 2, 23456}; } - static std::optional SdpToConfig(const SdpAudioFormat& audio_format) { + static std::optional SdpToConfig( + const SdpAudioFormat& /* audio_format */) { return Config(); } @@ -113,8 +114,8 @@ struct BaseAudioEncoderApi { struct AudioEncoderApiWithV1Make : BaseAudioEncoderApi { static std::unique_ptr MakeAudioEncoder( const Config&, - int payload_type, - std::optional codec_pair_id) { + int /* payload_type */, + std::optional /* codec_pair_id */) { auto encoder = std::make_unique>(); ON_CALL(*encoder, SampleRateHz).WillByDefault(Return(kV1SameRate)); return encoder; @@ -123,9 +124,9 @@ struct AudioEncoderApiWithV1Make : BaseAudioEncoderApi { struct AudioEncoderApiWithV2Make : BaseAudioEncoderApi { static std::unique_ptr MakeAudioEncoder( - const Environment& env, - const Config& config, - const AudioEncoderFactory::Options& options) { + const Environment& /* env */, + const Config& /* config */, + const AudioEncoderFactory::Options& /* options */) { auto encoder = std::make_unique>(); ON_CALL(*encoder, SampleRateHz).WillByDefault(Return(kV2SameRate)); return encoder; @@ -135,17 +136,17 @@ struct AudioEncoderApiWithV2Make : BaseAudioEncoderApi { struct AudioEncoderApiWithBothV1AndV2Make : BaseAudioEncoderApi { static std::unique_ptr MakeAudioEncoder( const Config&, - int payload_type, - std::optional codec_pair_id) { + int /* payload_type */, + std::optional /* codec_pair_id */) { auto encoder = std::make_unique>(); ON_CALL(*encoder, SampleRateHz).WillByDefault(Return(kV1SameRate)); return encoder; } static std::unique_ptr MakeAudioEncoder( - const Environment& env, - const Config& config, - const AudioEncoderFactory::Options& options) { + const Environment& /* env */, + const Config& /* config */, + const AudioEncoderFactory::Options& /* options */) { auto encoder = std::make_unique>(); ON_CALL(*encoder, SampleRateHz).WillByDefault(Return(kV2SameRate)); return encoder; diff --git a/api/data_channel_interface.cc b/api/data_channel_interface.cc index 062a592fcf..1f0c6acd1c 100644 --- a/api/data_channel_interface.cc +++ b/api/data_channel_interface.cc @@ -58,15 +58,15 @@ uint64_t DataChannelInterface::MaxSendQueueSize() { } // TODO(tommi): Remove method once downstream implementations have been removed. -bool DataChannelInterface::Send(const DataBuffer& buffer) { +bool DataChannelInterface::Send(const DataBuffer& /* buffer */) { RTC_DCHECK_NOTREACHED(); return false; } // TODO(tommi): Remove implementation once method is pure virtual. void DataChannelInterface::SendAsync( - DataBuffer buffer, - absl::AnyInvocable on_complete) { + DataBuffer /* buffer */, + absl::AnyInvocable /* on_complete */) { RTC_DCHECK_NOTREACHED(); } diff --git a/api/data_channel_interface.h b/api/data_channel_interface.h index 23936b1d4d..ea463dc781 100644 --- a/api/data_channel_interface.h +++ b/api/data_channel_interface.h @@ -99,7 +99,7 @@ class DataChannelObserver { // A data buffer was successfully received. virtual void OnMessage(const DataBuffer& buffer) = 0; // The data channel's buffered_amount has changed. - virtual void OnBufferedAmountChange(uint64_t sent_data_size) {} + virtual void OnBufferedAmountChange(uint64_t /* sent_data_size */) {} // Override this to get callbacks directly on the network thread. // An implementation that does that must not block the network thread diff --git a/api/environment/environment_factory.h b/api/environment/environment_factory.h index 0d37ea9aaf..66e51374d1 100644 --- a/api/environment/environment_factory.h +++ b/api/environment/environment_factory.h @@ -124,7 +124,7 @@ inline void EnvironmentFactory::Set(absl::Nullable utility) { namespace webrtc_create_environment_internal { -inline void Set(EnvironmentFactory& factory) {} +inline void Set(EnvironmentFactory& /* factory */) {} template void Set(EnvironmentFactory& factory, diff --git a/api/environment/environment_unittest.cc b/api/environment/environment_unittest.cc index bcadb49cb6..74787bf7f9 100644 --- a/api/environment/environment_unittest.cc +++ b/api/environment/environment_unittest.cc @@ -54,7 +54,9 @@ class FakeFieldTrials : public FieldTrialsView { } } - std::string Lookup(absl::string_view key) const override { return "fake"; } + std::string Lookup(absl::string_view /* key */) const override { + return "fake"; + } private: absl::AnyInvocable on_destroyed_;