diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc index 005b3f76b..147cb1823 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc @@ -312,6 +312,11 @@ int AudioProcessingImpl::input_sample_rate_hz() const { return fwd_in_format_.rate(); } +int AudioProcessingImpl::sample_rate_hz() const { + CriticalSectionScoped crit_scoped(crit_); + return fwd_in_format_.rate(); +} + int AudioProcessingImpl::proc_sample_rate_hz() const { return fwd_proc_format_.rate(); } diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h index 3a0ad2402..d34f305a9 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.h +++ b/webrtc/modules/audio_processing/audio_processing_impl.h @@ -98,6 +98,7 @@ class AudioProcessingImpl : public AudioProcessing { } virtual int set_sample_rate_hz(int rate) OVERRIDE; virtual int input_sample_rate_hz() const OVERRIDE; + virtual int sample_rate_hz() const OVERRIDE; virtual int proc_sample_rate_hz() const OVERRIDE; virtual int proc_split_sample_rate_hz() const OVERRIDE; virtual int num_input_channels() const OVERRIDE; diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h index ecd418726..6db1d12bc 100644 --- a/webrtc/modules/audio_processing/include/audio_processing.h +++ b/webrtc/modules/audio_processing/include/audio_processing.h @@ -195,10 +195,11 @@ class AudioProcessing { // DEPRECATED. // TODO(ajm): Remove after Chromium has upgraded to using Initialize(). virtual int set_sample_rate_hz(int rate) = 0; - // DEPRECATED. // TODO(ajm): Remove after voice engine no longer requires it to resample // the reverse stream to the forward rate. virtual int input_sample_rate_hz() const = 0; + // TODO(ajm): Remove after Chromium no longer depends on it. + virtual int sample_rate_hz() const = 0; // TODO(ajm): Only intended for internal use. Make private and friend the // necessary classes? diff --git a/webrtc/modules/audio_processing/include/mock_audio_processing.h b/webrtc/modules/audio_processing/include/mock_audio_processing.h index aa94026e2..c1ac23adf 100644 --- a/webrtc/modules/audio_processing/include/mock_audio_processing.h +++ b/webrtc/modules/audio_processing/include/mock_audio_processing.h @@ -194,6 +194,8 @@ class MockAudioProcessing : public AudioProcessing { int(int rate)); MOCK_CONST_METHOD0(input_sample_rate_hz, int()); + MOCK_CONST_METHOD0(sample_rate_hz, + int()); MOCK_CONST_METHOD0(proc_sample_rate_hz, int()); MOCK_CONST_METHOD0(proc_split_sample_rate_hz,