OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/environment.h" | 5 #include "base/environment.h" |
6 #include "base/test/test_timeouts.h" | 6 #include "base/test/test_timeouts.h" |
7 #include "content/renderer/media/audio_hardware.h" | 7 #include "content/renderer/media/audio_hardware.h" |
8 #include "content/renderer/media/webrtc_audio_device_impl.h" | 8 #include "content/renderer/media/webrtc_audio_device_impl.h" |
9 #include "content/test/webrtc_audio_device_test.h" | 9 #include "content/test/webrtc_audio_device_test.h" |
10 #include "media/audio/audio_manager.h" | 10 #include "media/audio/audio_manager.h" |
(...skipping 14 matching lines...) Expand all Loading... | |
25 namespace { | 25 namespace { |
26 | 26 |
27 ACTION_P(QuitMessageLoop, loop_or_proxy) { | 27 ACTION_P(QuitMessageLoop, loop_or_proxy) { |
28 loop_or_proxy->PostTask(FROM_HERE, MessageLoop::QuitClosure()); | 28 loop_or_proxy->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
29 } | 29 } |
30 | 30 |
31 class AudioUtil : public AudioUtilInterface { | 31 class AudioUtil : public AudioUtilInterface { |
32 public: | 32 public: |
33 AudioUtil() {} | 33 AudioUtil() {} |
34 | 34 |
35 virtual double GetAudioHardwareSampleRate() OVERRIDE { | 35 virtual double GetAudioHardwareSampleRate() OVERRIDE { |
tommi (sloooow) - chröme
2012/03/10 10:11:32
can you please change return value to int to be co
vrk (LEFT CHROMIUM)
2012/03/16 18:30:41
Done.
| |
36 return media::GetAudioHardwareSampleRate(); | 36 return media::GetAudioHardwareSampleRate(); |
37 } | 37 } |
38 virtual double GetAudioInputHardwareSampleRate( | 38 virtual double GetAudioInputHardwareSampleRate( |
tommi (sloooow) - chröme
2012/03/10 10:11:32
same here
vrk (LEFT CHROMIUM)
2012/03/16 18:30:41
Done.
| |
39 const std::string& device_id) OVERRIDE { | 39 const std::string& device_id) OVERRIDE { |
40 return media::GetAudioInputHardwareSampleRate(device_id); | 40 return media::GetAudioInputHardwareSampleRate(device_id); |
41 } | 41 } |
42 virtual uint32 GetAudioInputHardwareChannelCount( | 42 virtual ChannelLayout GetAudioInputHardwareChannelLayout( |
43 const std::string& device_id) OVERRIDE { | 43 const std::string& device_id) OVERRIDE { |
44 return media::GetAudioInputHardwareChannelCount(device_id); | 44 return media::GetAudioInputHardwareChannelLayout(device_id); |
45 } | 45 } |
46 private: | 46 private: |
47 DISALLOW_COPY_AND_ASSIGN(AudioUtil); | 47 DISALLOW_COPY_AND_ASSIGN(AudioUtil); |
48 }; | 48 }; |
49 | 49 |
50 class AudioUtilNoHardware : public AudioUtilInterface { | 50 class AudioUtilNoHardware : public AudioUtilInterface { |
51 public: | 51 public: |
52 AudioUtilNoHardware(double output_rate, double input_rate, | 52 AudioUtilNoHardware(double output_rate, double input_rate, |
53 uint32 input_channels) | 53 ChannelLayout input_channel_layout) |
54 : output_rate_(output_rate), | 54 : output_rate_(output_rate), |
55 input_rate_(input_rate), | 55 input_rate_(input_rate), |
56 input_channels_(input_channels) { | 56 input_channel_layout_(input_channel_layout) { |
57 } | 57 } |
58 | 58 |
59 virtual double GetAudioHardwareSampleRate() OVERRIDE { | 59 virtual double GetAudioHardwareSampleRate() OVERRIDE { |
60 return output_rate_; | 60 return output_rate_; |
61 } | 61 } |
62 virtual double GetAudioInputHardwareSampleRate( | 62 virtual double GetAudioInputHardwareSampleRate( |
63 const std::string& device_id) OVERRIDE { | 63 const std::string& device_id) OVERRIDE { |
64 return input_rate_; | 64 return input_rate_; |
65 } | 65 } |
66 virtual uint32 GetAudioInputHardwareChannelCount( | 66 virtual ChannelLayout GetAudioInputHardwareChannelLayout( |
67 const std::string& device_id) OVERRIDE { | 67 const std::string& device_id) OVERRIDE { |
68 return input_channels_; | 68 return input_channel_layout_; |
69 } | 69 } |
70 | 70 |
71 private: | 71 private: |
72 double output_rate_; | 72 double output_rate_; |
73 double input_rate_; | 73 double input_rate_; |
74 uint32 input_channels_; | 74 ChannelLayout input_channel_layout_; |
75 DISALLOW_COPY_AND_ASSIGN(AudioUtilNoHardware); | 75 DISALLOW_COPY_AND_ASSIGN(AudioUtilNoHardware); |
76 }; | 76 }; |
77 | 77 |
78 bool IsRunningHeadless() { | 78 bool IsRunningHeadless() { |
79 scoped_ptr<base::Environment> env(base::Environment::Create()); | 79 scoped_ptr<base::Environment> env(base::Environment::Create()); |
80 if (env->HasVar("CHROME_HEADLESS")) | 80 if (env->HasVar("CHROME_HEADLESS")) |
81 return true; | 81 return true; |
82 return false; | 82 return false; |
83 } | 83 } |
84 | 84 |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
230 int invalid_rates[] = {-1, 0, 8000, 11025, 22050, 32000, 192000}; | 230 int invalid_rates[] = {-1, 0, 8000, 11025, 22050, 32000, 192000}; |
231 for (size_t i = 0; i < arraysize(invalid_rates); ++i) { | 231 for (size_t i = 0; i < arraysize(invalid_rates); ++i) { |
232 EXPECT_FALSE(FindElementInArray(valid_rates, arraysize(valid_rates), | 232 EXPECT_FALSE(FindElementInArray(valid_rates, arraysize(valid_rates), |
233 invalid_rates[i])); | 233 invalid_rates[i])); |
234 } | 234 } |
235 } | 235 } |
236 | 236 |
237 // Basic test that instantiates and initializes an instance of | 237 // Basic test that instantiates and initializes an instance of |
238 // WebRtcAudioDeviceImpl. | 238 // WebRtcAudioDeviceImpl. |
239 TEST_F(WebRTCAudioDeviceTest, Construct) { | 239 TEST_F(WebRTCAudioDeviceTest, Construct) { |
240 AudioUtilNoHardware audio_util(48000.0, 48000.0, 1); | 240 AudioUtilNoHardware audio_util(48000.0, 48000.0, CHANNEL_LAYOUT_MONO); |
241 SetAudioUtilCallback(&audio_util); | 241 SetAudioUtilCallback(&audio_util); |
242 scoped_refptr<WebRtcAudioDeviceImpl> audio_device( | 242 scoped_refptr<WebRtcAudioDeviceImpl> audio_device( |
243 new WebRtcAudioDeviceImpl()); | 243 new WebRtcAudioDeviceImpl()); |
244 | 244 |
245 audio_device->SetSessionId(1); | 245 audio_device->SetSessionId(1); |
246 | 246 |
247 WebRTCAutoDelete<webrtc::VoiceEngine> engine(webrtc::VoiceEngine::Create()); | 247 WebRTCAutoDelete<webrtc::VoiceEngine> engine(webrtc::VoiceEngine::Create()); |
248 ASSERT_TRUE(engine.valid()); | 248 ASSERT_TRUE(engine.valid()); |
249 | 249 |
250 ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get()); | 250 ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get()); |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
511 MessageLoop::QuitClosure(), | 511 MessageLoop::QuitClosure(), |
512 TestTimeouts::action_timeout_ms()); | 512 TestTimeouts::action_timeout_ms()); |
513 message_loop_.Run(); | 513 message_loop_.Run(); |
514 | 514 |
515 EXPECT_EQ(0, base->StopSend(ch)); | 515 EXPECT_EQ(0, base->StopSend(ch)); |
516 EXPECT_EQ(0, base->StopPlayout(ch)); | 516 EXPECT_EQ(0, base->StopPlayout(ch)); |
517 | 517 |
518 EXPECT_EQ(0, base->DeleteChannel(ch)); | 518 EXPECT_EQ(0, base->DeleteChannel(ch)); |
519 EXPECT_EQ(0, base->Terminate()); | 519 EXPECT_EQ(0, base->Terminate()); |
520 } | 520 } |
OLD | NEW |