From d59359af4ddb7eddafc009e7d03f2d037327bf1b Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Tue, 22 Apr 2014 18:07:49 +0000 Subject: [PATCH] Remove 44.1 kHz workaround from the iOS AudioDevice. Long, long ago, webrtc didn't support audio at 44.1 kHz. As a result we treated 44.1 kHz audio as 44 kHz. We now have an arbitrary rate resampler and have no trouble supporting 44.1 (see 1395 for all the details). I must have missed updating iOS at the time. This shouldn't result in a visible change as 16 kHz is selected as the preferred hardware rate. BUG=1395 R=fischman@webrtc.org, henrikg@webrtc.org Review URL: https://webrtc-codereview.appspot.com/10949004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5957 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_device/ios/audio_device_ios.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.cc b/webrtc/modules/audio_device/ios/audio_device_ios.cc index b459a4644..7a7189a2b 100644 --- a/webrtc/modules/audio_device/ios/audio_device_ios.cc +++ b/webrtc/modules/audio_device/ios/audio_device_ios.cc @@ -1299,7 +1299,7 @@ int32_t AudioDeviceIPhone::InitPlayOrRecord() { // todo: Add 48 kHz (increase buffer sizes). Other fs? if ((playoutDesc.mSampleRate > 44090.0) && (playoutDesc.mSampleRate < 44110.0)) { - _adbSampFreq = 44000; + _adbSampFreq = 44100; } else if ((playoutDesc.mSampleRate > 15990.0) && (playoutDesc.mSampleRate < 16010.0)) { _adbSampFreq = 16000; @@ -1730,7 +1730,7 @@ void AudioDeviceIPhone::UpdatePlayoutDelay() { _playoutDelayMeasurementCounter = 0; } - // todo: Add playout buffer? (Only used for 44.1 kHz) + // todo: Add playout buffer? } void AudioDeviceIPhone::UpdateRecordingDelay() {