zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop the restriction on same forward and reverse sample rate on the AudioFrame interface of the APM

Browse Source 
R=peah@webrtc.org

Review URL: https://codereview.webrtc.org/1766233003 .

Cr-Commit-Position: refs/heads/master@{#11913}
This commit is contained in:
Alex Luebs
2016-03-08 17:52:52 +01:00
parent b8f7885861
commit 5b830fed07
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -875,11 +875,6 @@ int AudioProcessingImpl::AnalyzeReverseStream(AudioFrame* frame) {
frame->sample_rate_hz_ != kSampleRate48kHz) {
return kBadSampleRateError;
}
// This interface does not tolerate different forward and reverse rates.
if (frame->sample_rate_hz_ !=
formats_.api_format.input_stream().sample_rate_hz()) {
return kBadSampleRateError;
}
if (frame->num_channels_ <= 0) {
return kBadNumberChannelsError;

8
webrtc/modules/audio_processing/audio_processing_impl_unittest.cc
View File

@ -65,12 +65,10 @@ TEST(AudioProcessingImplTest, AudioParameterChangeTriggersInit) {
frame.num_channels_ = 2;
EXPECT_NOERR(mock.AnalyzeReverseStream(&frame));
// A new sample rate passed to AnalyzeReverseStream should be an error and
// not cause an init.
// A new sample rate passed to AnalyzeReverseStream should cause an init.
SetFrameSampleRate(&frame, 16000);
EXPECT_CALL(mock, InitializeLocked())
.Times(0);
EXPECT_EQ(mock.kBadSampleRateError, mock.AnalyzeReverseStream(&frame));
EXPECT_CALL(mock, InitializeLocked()).Times(1);
EXPECT_NOERR(mock.AnalyzeReverseStream(&frame));
}
} // namespace webrtc