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

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 copyright years 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 4cf33379daa6114e62284ad43c0b68d929dfd06a..d9b291c94a5b09df88fc921acea1a406a771f744 100644
--- a/content/renderer/media/webrtc_audio_device_unittest.cc
+++ b/content/renderer/media/webrtc_audio_device_unittest.cc
@@ -32,16 +32,16 @@ class AudioUtil : public AudioUtilInterface {
public:
AudioUtil() {}
- virtual double GetAudioHardwareSampleRate() OVERRIDE {
+ virtual int GetAudioHardwareSampleRate() OVERRIDE {
return media::GetAudioHardwareSampleRate();
}
- virtual double GetAudioInputHardwareSampleRate(
+ virtual int GetAudioInputHardwareSampleRate(
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);
@@ -49,29 +49,29 @@ class AudioUtil : public AudioUtilInterface {
class AudioUtilNoHardware : public AudioUtilInterface {
public:
- AudioUtilNoHardware(double output_rate, double input_rate,
- uint32 input_channels)
+ AudioUtilNoHardware(int output_rate, int input_rate,
+ 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 {
+ virtual int GetAudioHardwareSampleRate() OVERRIDE {
return output_rate_;
}
- virtual double GetAudioInputHardwareSampleRate(
+ virtual int GetAudioInputHardwareSampleRate(
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_;
+ int output_rate_;
+ int input_rate_;
+ 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, 48000, CHANNEL_LAYOUT_MONO);
SetAudioUtilCallback(&audio_util);
scoped_refptr<WebRtcAudioDeviceImpl> audio_device(
new WebRtcAudioDeviceImpl());
« no previous file with comments | « content/renderer/media/webrtc_audio_device_impl.cc ('k') | content/renderer/pepper/pepper_platform_audio_input_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698