generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restore sample_rate_hz() until Chromium is updated to not use it.

Browse Source 
TBR=bjornv
TESTED=Chromium builds against webrtc head.
BUG=2894

Review URL: https://webrtc-codereview.appspot.com/12349004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5962 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2014-04-23 03:33:54 +00:00
parent 504fc89f36
commit 46b31b17df
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/audio_processing/audio_processing_impl.cc
View File

@ -312,6 +312,11 @@ int AudioProcessingImpl::input_sample_rate_hz() const {
return fwd_in_format_.rate(); 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 { int AudioProcessingImpl::proc_sample_rate_hz() const {
return fwd_proc_format_.rate(); return fwd_proc_format_.rate();
} }

1
webrtc/modules/audio_processing/audio_processing_impl.h
View File

@ -98,6 +98,7 @@ class AudioProcessingImpl : public AudioProcessing {
} }
virtual int set_sample_rate_hz(int rate) OVERRIDE; virtual int set_sample_rate_hz(int rate) OVERRIDE;
virtual int input_sample_rate_hz() const 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_sample_rate_hz() const OVERRIDE;
virtual int proc_split_sample_rate_hz() const OVERRIDE; virtual int proc_split_sample_rate_hz() const OVERRIDE;
virtual int num_input_channels() const OVERRIDE; virtual int num_input_channels() const OVERRIDE;

3
webrtc/modules/audio_processing/include/audio_processing.h
View File

@ -195,10 +195,11 @@ class AudioProcessing {
// DEPRECATED. // DEPRECATED.
// TODO(ajm): Remove after Chromium has upgraded to using Initialize(). // TODO(ajm): Remove after Chromium has upgraded to using Initialize().
virtual int set_sample_rate_hz(int rate) = 0; virtual int set_sample_rate_hz(int rate) = 0;
// DEPRECATED.
// TODO(ajm): Remove after voice engine no longer requires it to resample // TODO(ajm): Remove after voice engine no longer requires it to resample
// the reverse stream to the forward rate. // the reverse stream to the forward rate.
virtual int input_sample_rate_hz() const = 0; 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 // TODO(ajm): Only intended for internal use. Make private and friend the
// necessary classes? // necessary classes?

2
webrtc/modules/audio_processing/include/mock_audio_processing.h
View File

@ -194,6 +194,8 @@ class MockAudioProcessing : public AudioProcessing {
int(int rate)); int(int rate));
MOCK_CONST_METHOD0(input_sample_rate_hz, MOCK_CONST_METHOD0(input_sample_rate_hz,
int()); int());
MOCK_CONST_METHOD0(sample_rate_hz,
int());
MOCK_CONST_METHOD0(proc_sample_rate_hz, MOCK_CONST_METHOD0(proc_sample_rate_hz,
int()); int());
MOCK_CONST_METHOD0(proc_split_sample_rate_hz, MOCK_CONST_METHOD0(proc_split_sample_rate_hz,