Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Unified Diff: content/renderer/media/webrtc_audio_device_unittest.cc

Issue 9655018: Make AudioParameters a class instead of a struct (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 33507f06cbee270cdeff8a9488d47b5ba0f5a911..95babf3b54c05cfbbd0b29e236997d0f25b79b49 100644
--- a/content/renderer/media/webrtc_audio_device_unittest.cc
+++ b/content/renderer/media/webrtc_audio_device_unittest.cc
@@ -39,9 +39,9 @@ class AudioUtil : public AudioUtilInterface {
const std::string& device_id) OVERRIDE {
return media::GetAudioInputHardwareSampleRate(device_id);
}
- virtual uint32 GetAudioInputHardwareChannelCount(
+ virtual ChannelLayout GetAudioInputHardwareChannelLayout(
const std::string& device_id) OVERRIDE {
- return media::GetAudioInputHardwareChannelCount(device_id);
+ return media::GetAudioInputHardwareChannelLayout(device_id);
}
private:
DISALLOW_COPY_AND_ASSIGN(AudioUtil);
@@ -50,10 +50,10 @@ class AudioUtil : public AudioUtilInterface {
class AudioUtilNoHardware : public AudioUtilInterface {
public:
AudioUtilNoHardware(double output_rate, double input_rate,
- uint32 input_channels)
+ ChannelLayout input_channel_layout)
: output_rate_(output_rate),
input_rate_(input_rate),
- input_channels_(input_channels) {
+ input_channel_layout_(input_channel_layout) {
}
virtual double GetAudioHardwareSampleRate() OVERRIDE {
@@ -63,15 +63,15 @@ class AudioUtilNoHardware : public AudioUtilInterface {
const std::string& device_id) OVERRIDE {
return input_rate_;
}
- virtual uint32 GetAudioInputHardwareChannelCount(
+ virtual ChannelLayout GetAudioInputHardwareChannelLayout(
const std::string& device_id) OVERRIDE {
- return input_channels_;
+ return input_channel_layout_;
}
private:
double output_rate_;
double input_rate_;
- uint32 input_channels_;
+ ChannelLayout input_channel_layout_;
DISALLOW_COPY_AND_ASSIGN(AudioUtilNoHardware);
};
@@ -237,7 +237,7 @@ TEST_F(WebRTCAudioDeviceTest, TestValidOutputRates) {
// Basic test that instantiates and initializes an instance of
// WebRtcAudioDeviceImpl.
TEST_F(WebRTCAudioDeviceTest, Construct) {
- AudioUtilNoHardware audio_util(48000.0, 48000.0, 1);
+ AudioUtilNoHardware audio_util(48000.0, 48000.0, CHANNEL_LAYOUT_MONO);
SetAudioUtilCallback(&audio_util);
scoped_refptr<WebRtcAudioDeviceImpl> audio_device(
new WebRtcAudioDeviceImpl());

Powered by Google App Engine
This is Rietveld 408576698