Chromium Code Reviews| Index: content/renderer/media/webrtc_audio_device_unittest.cc |
| diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc |
| index 14bbcded20892f2c04d127e733986c2b6ac55c48..788e1649b9cf29e36b03d89e66c6a9e0322a1d24 100644 |
| --- a/content/renderer/media/webrtc_audio_device_unittest.cc |
| +++ b/content/renderer/media/webrtc_audio_device_unittest.cc |
| @@ -38,14 +38,20 @@ class AudioUtil : public AudioUtilInterface { |
| virtual double GetAudioInputHardwareSampleRate() OVERRIDE { |
| return media::GetAudioInputHardwareSampleRate(); |
| } |
| + virtual size_t GetAudioInputHardwareChannels() OVERRIDE { |
|
tommi (sloooow) - chröme
2012/01/17 12:01:08
GetAudioInputHardwareChannelCount
henrika (OOO until Aug 14)
2012/01/17 12:54:59
Done.
|
| + return media::GetAudioInputHardwareChannels(); |
| + } |
| private: |
| DISALLOW_COPY_AND_ASSIGN(AudioUtil); |
| }; |
| class AudioUtilNoHardware : public AudioUtilInterface { |
| public: |
| - AudioUtilNoHardware(double output_rate, double input_rate) |
| - : output_rate_(output_rate), input_rate_(input_rate) { |
| + AudioUtilNoHardware(double output_rate, double input_rate, |
| + size_t input_channels) |
| + : output_rate_(output_rate), |
| + input_rate_(input_rate), |
| + input_channels_(input_channels) { |
| } |
| virtual double GetAudioHardwareSampleRate() OVERRIDE { |
| @@ -54,10 +60,14 @@ class AudioUtilNoHardware : public AudioUtilInterface { |
| virtual double GetAudioInputHardwareSampleRate() OVERRIDE { |
| return input_rate_; |
| } |
| + virtual size_t GetAudioInputHardwareChannels() OVERRIDE { |
| + return input_channels_; |
| + } |
| private: |
| double output_rate_; |
| double input_rate_; |
| + size_t input_channels_; |
| DISALLOW_COPY_AND_ASSIGN(AudioUtilNoHardware); |
| }; |
| @@ -82,7 +92,8 @@ bool HardwareSampleRatesAreValid() { |
| static_cast<int>(audio_hardware::GetInputSampleRate()); |
| bool rates_are_valid = |
| ((output_sample_rate == 44100 || output_sample_rate == 48000) && |
| - (input_sample_rate == 44100 || input_sample_rate == 48000)); |
| + (input_sample_rate == 44100 || input_sample_rate == 48000 || |
| + input_sample_rate == 16000)); |
| DLOG_IF(WARNING, !rates_are_valid) << "Non-supported sample rate detected."; |
| return rates_are_valid; |
| } |
| @@ -160,10 +171,11 @@ class WebRTCMediaProcessImpl : public webrtc::VoEMediaProcess { |
| // Basic test that instantiates and initializes an instance of |
| // WebRtcAudioDeviceImpl. |
| TEST_F(WebRTCAudioDeviceTest, Construct) { |
| - AudioUtilNoHardware audio_util(48000.0, 48000.0); |
| + AudioUtilNoHardware audio_util(48000.0, 48000.0, 1); |
| SetAudioUtilCallback(&audio_util); |
| scoped_refptr<WebRtcAudioDeviceImpl> audio_device( |
| new WebRtcAudioDeviceImpl()); |
| + |
| audio_device->SetSessionId(1); |
| WebRTCAutoDelete<webrtc::VoiceEngine> engine(webrtc::VoiceEngine::Create()); |