From 1e8bb67295b772f5ebd3c4a7c79cdbddfe563a7c Mon Sep 17 00:00:00 2001 From: Ivan Murashov Date: Tue, 24 May 2022 10:49:50 +0300 Subject: [PATCH] GCC: Avoid symbol clash in RenderBuffer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC fails to resolve getter for RenderBuffer::Block() because its return type has the same name with the getter method. Rename getter method with the prefix "Get" as guided in the https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/blink-c++.md#Precede-setters-with-the-word-Set_use-bare-words-for-getters "If a getter’s name collides with a type name, prefix it with “Get”." Bug: chromium:819294, webrtc:14089 Change-Id: Ieaa3af27415eb8c39806aa8480897b47fd07baa8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/263420 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Reviewed-by: Gustaf Ullberg Cr-Commit-Position: refs/heads/main@{#36982} --- AUTHORS | 1 + modules/audio_processing/aec3/aec_state.cc | 2 +- modules/audio_processing/aec3/block_processor_unittest.cc | 2 +- modules/audio_processing/aec3/echo_remover.cc | 2 +- modules/audio_processing/aec3/filter_analyzer.cc | 2 +- modules/audio_processing/aec3/render_buffer.h | 2 +- modules/audio_processing/aec3/render_signal_analyzer.cc | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 68653f4e0d..1a000c1b8c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -138,6 +138,7 @@ Google Inc. <*@google.com> Highfive, Inc. <*@highfive.com> HyperConnect Inc. <*@hpcnt.com> Intel Corporation <*@intel.com> +LG Electronics, Inc. <*@lge.com> Life On Air Inc. <*@lifeonair.com> Microsoft Corporation <*@microsoft.com> MIPS Technologies <*@mips.com> diff --git a/modules/audio_processing/aec3/aec_state.cc b/modules/audio_processing/aec3/aec_state.cc index 11f0a139ed..92cf3e2f2c 100644 --- a/modules/audio_processing/aec3/aec_state.cc +++ b/modules/audio_processing/aec3/aec_state.cc @@ -207,7 +207,7 @@ void AecState::Update( } const Block& aligned_render_block = - render_buffer.Block(-delay_state_.MinDirectPathFilterDelay()); + render_buffer.GetBlock(-delay_state_.MinDirectPathFilterDelay()); // Update render counters. bool active_render = false; diff --git a/modules/audio_processing/aec3/block_processor_unittest.cc b/modules/audio_processing/aec3/block_processor_unittest.cc index 535762140d..aba5c4186d 100644 --- a/modules/audio_processing/aec3/block_processor_unittest.cc +++ b/modules/audio_processing/aec3/block_processor_unittest.cc @@ -321,7 +321,7 @@ TEST(BlockProcessor, ExternalDelayAppliedCorrectlyWithInitialCaptureCalls) { const absl::optional& /*external_delay*/, RenderBuffer* render_buffer, Block* /*linear_output*/, Block* capture) { - const auto& render = render_buffer->Block(0); + const auto& render = render_buffer->GetBlock(0); const auto render_view = render.View(/*band=*/0, /*channel=*/0); const auto capture_view = capture->View(/*band=*/0, /*channel=*/0); for (size_t i = 0; i < kBlockSize; ++i) { diff --git a/modules/audio_processing/aec3/echo_remover.cc b/modules/audio_processing/aec3/echo_remover.cc index 09b5da3a04..3bca86c7de 100644 --- a/modules/audio_processing/aec3/echo_remover.cc +++ b/modules/audio_processing/aec3/echo_remover.cc @@ -245,7 +245,7 @@ void EchoRemoverImpl::ProcessCapture( Block* linear_output, Block* capture) { ++block_counter_; - const Block& x = render_buffer->Block(0); + const Block& x = render_buffer->GetBlock(0); Block* y = capture; RTC_DCHECK(render_buffer); RTC_DCHECK(y); diff --git a/modules/audio_processing/aec3/filter_analyzer.cc b/modules/audio_processing/aec3/filter_analyzer.cc index 5587584c51..c809a34d62 100644 --- a/modules/audio_processing/aec3/filter_analyzer.cc +++ b/modules/audio_processing/aec3/filter_analyzer.cc @@ -131,7 +131,7 @@ void FilterAnalyzer::AnalyzeRegion( st_ch.consistent_estimate = st_ch.consistent_filter_detector.Detect( h_highpass_[ch], region_, - render_buffer.Block(-filter_delays_blocks_[ch]), st_ch.peak_index, + render_buffer.GetBlock(-filter_delays_blocks_[ch]), st_ch.peak_index, filter_delays_blocks_[ch]); } } diff --git a/modules/audio_processing/aec3/render_buffer.h b/modules/audio_processing/aec3/render_buffer.h index 410ac32b14..8adc996087 100644 --- a/modules/audio_processing/aec3/render_buffer.h +++ b/modules/audio_processing/aec3/render_buffer.h @@ -40,7 +40,7 @@ class RenderBuffer { ~RenderBuffer(); // Get a block. - const Block& Block(int buffer_offset_blocks) const { + const Block& GetBlock(int buffer_offset_blocks) const { int position = block_buffer_->OffsetIndex(block_buffer_->read, buffer_offset_blocks); return block_buffer_->buffer[position]; diff --git a/modules/audio_processing/aec3/render_signal_analyzer.cc b/modules/audio_processing/aec3/render_signal_analyzer.cc index a3f27b7b56..bfbeb0ec2e 100644 --- a/modules/audio_processing/aec3/render_signal_analyzer.cc +++ b/modules/audio_processing/aec3/render_signal_analyzer.cc @@ -66,7 +66,7 @@ void IdentifyStrongNarrowBandComponent(const RenderBuffer& render_buffer, *narrow_peak_band = absl::nullopt; } - const Block& x_latest = render_buffer.Block(0); + const Block& x_latest = render_buffer.GetBlock(0); float max_peak_level = 0.f; for (int channel = 0; channel < x_latest.NumChannels(); ++channel) { rtc::ArrayView X2_latest =