From 95663fe7464c2c022cbbf83fa3a7b7b8932be999 Mon Sep 17 00:00:00 2001 From: aluebs Date: Tue, 12 Jul 2016 12:43:01 -0700 Subject: [PATCH] Remove unused NonlinearBeamformer interface Review-Url: https://codereview.webrtc.org/2129663002 Cr-Commit-Position: refs/heads/master@{#13451} --- .../beamformer/mock_nonlinear_beamformer.h | 3 --- .../beamformer/nonlinear_beamformer.cc | 12 ------------ .../beamformer/nonlinear_beamformer.h | 4 ---- 3 files changed, 19 deletions(-) diff --git a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h b/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h index 11201f507f..3bb1485942 100644 --- a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h +++ b/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h @@ -28,9 +28,6 @@ class MockNonlinearBeamformer : public NonlinearBeamformer { : NonlinearBeamformer(array_geometry, 1u) {} MOCK_METHOD2(Initialize, void(int chunk_size_ms, int sample_rate_hz)); - // TODO(aluebs): Remove once the dependencies have moved to new API. - MOCK_METHOD2(ProcessChunk, void(const ChannelBuffer& data, - ChannelBuffer* output)); MOCK_METHOD1(AnalyzeChunk, void(const ChannelBuffer& data)); MOCK_METHOD1(PostFilter, void(ChannelBuffer* data)); MOCK_METHOD1(IsInBeam, bool(const SphericalPointf& spherical_point)); diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc index 5412fb5b1e..bfb65c0f77 100644 --- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc +++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.cc @@ -421,18 +421,6 @@ void NonlinearBeamformer::PostFilter(ChannelBuffer* data) { } } -void NonlinearBeamformer::ProcessChunk(const ChannelBuffer& input, - ChannelBuffer* output) { - RTC_DCHECK_GT(output->num_channels(), 0u); - RTC_DCHECK_EQ(output->num_frames_per_band(), input.num_frames_per_band()); - AnalyzeChunk(input); - for (size_t i = 0u; i < input.num_bands(); ++i) { - std::memcpy(output->channels(i)[0], input.channels(i)[0], - sizeof(input.channels(0)[0][0]) * input.num_frames_per_band()); - } - PostFilter(output); -} - void NonlinearBeamformer::AimAt(const SphericalPointf& target_direction) { target_angle_radians_ = target_direction.azimuth(); InitHighFrequencyCorrectionRanges(); diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h index 10ef6e5af6..c9fd995376 100644 --- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h +++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h @@ -78,10 +78,6 @@ class NonlinearBeamformer : public LappedTransform::Callback { // frames and channels must correspond to the constructor parameters. virtual void PostFilter(ChannelBuffer* data); - // TODO(aluebs): Remove once the dependencies have moved to new API. - virtual void ProcessChunk(const ChannelBuffer& input, - ChannelBuffer* output); - virtual void AimAt(const SphericalPointf& target_direction); virtual bool IsInBeam(const SphericalPointf& spherical_point);