diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 20:55:23 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 20:55:23 +0000 |
| commit | cfb09c2d58ecb16b14192619695ea54570344ca7 (patch) | |
| tree | 4d55c178533d474429eef44382fdc93c9fa0e28f /media/audio/linux/alsa_output_unittest.cc | |
| parent | ef12d1e6acb871dbd01f330d0b10ada24d209371 (diff) | |
| download | chromium_src-cfb09c2d58ecb16b14192619695ea54570344ca7.zip chromium_src-cfb09c2d58ecb16b14192619695ea54570344ca7.tar.gz chromium_src-cfb09c2d58ecb16b14192619695ea54570344ca7.tar.bz2 | |
Make AudioParameters a class instead of a struct
Also collapses some long parameter lists into AudioParameters and moves some
of the hardcoded values (e.g. 16 bit audio in AudioDevice) to more appropriate
locations.
BUG=115902
TEST=manually testing everything works out
Review URL: https://chromiumcodereview.appspot.com/9655018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/linux/alsa_output_unittest.cc')
| -rw-r--r-- | media/audio/linux/alsa_output_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc index 8658996..adc06e4 100644 --- a/media/audio/linux/alsa_output_unittest.cc +++ b/media/audio/linux/alsa_output_unittest.cc @@ -658,11 +658,11 @@ TEST_F(AlsaPcmOutputStreamTest, AutoSelectDevice_DeviceSelect) { CHANNEL_LAYOUT_MONO, CHANNEL_LAYOUT_STEREO, CHANNEL_LAYOUT_SURROUND, - CHANNEL_LAYOUT_4POINT0, - CHANNEL_LAYOUT_5POINT0, - CHANNEL_LAYOUT_5POINT1, - CHANNEL_LAYOUT_7POINT0, - CHANNEL_LAYOUT_7POINT1 }; + CHANNEL_LAYOUT_4_0, + CHANNEL_LAYOUT_5_0, + CHANNEL_LAYOUT_5_1, + CHANNEL_LAYOUT_7_0, + CHANNEL_LAYOUT_7_1 }; for (int i = 1; i < 9; ++i) { @@ -746,7 +746,7 @@ TEST_F(AlsaPcmOutputStreamTest, AutoSelectDevice_FallbackDevices) { EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, StrEq(fourth_try.c_str()), _, _)) .WillOnce(Return(kTestFailedErrno)); - AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5POINT0); + AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5_0); EXPECT_FALSE(test_stream->AutoSelectDevice(5)); test_stream->Close(); } @@ -765,7 +765,7 @@ TEST_F(AlsaPcmOutputStreamTest, AutoSelectDevice_HintFail) { EXPECT_CALL(mock_alsa_wrapper_, StrError(kTestFailedErrno)) .WillOnce(Return(kDummyMessage)); - AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5POINT0); + AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5_0); EXPECT_TRUE(test_stream->AutoSelectDevice(5)); EXPECT_TRUE(test_stream->should_downmix_); test_stream->Close(); |