Index: media/audio/audio_parameters_unittest.cc |
=================================================================== |
--- media/audio/audio_parameters_unittest.cc (revision 128216) |
+++ media/audio/audio_parameters_unittest.cc (working copy) |
@@ -34,7 +34,7 @@ |
int expected_rate = 44100; |
int expected_samples = 880; |
- AudioParameters params(expected_format, expected_channel_layout, |
+ AudioParameters params(expected_format, false, expected_channel_layout, |
expected_rate, expected_bits, expected_samples); |
EXPECT_EQ(expected_format, params.format()); |
@@ -46,109 +46,109 @@ |
} |
TEST(AudioParameters, GetBytesPerBuffer) { |
- EXPECT_EQ(100, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, |
+ EXPECT_EQ(100, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
CHANNEL_LAYOUT_MONO, 1000, 8, 100) |
.GetBytesPerBuffer()); |
- EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, |
+ EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
CHANNEL_LAYOUT_MONO, 1000, 16, 100) |
.GetBytesPerBuffer()); |
- EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, |
+ EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
CHANNEL_LAYOUT_STEREO, 1000, 8, 100) |
.GetBytesPerBuffer()); |
- EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, |
+ EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
CHANNEL_LAYOUT_MONO, 1000, 8, 200) |
.GetBytesPerBuffer()); |
- EXPECT_EQ(800, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, |
+ EXPECT_EQ(800, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
CHANNEL_LAYOUT_STEREO, 1000, 16, 200) |
.GetBytesPerBuffer()); |
} |
TEST(AudioParameters, GetBytesPerSecond) { |
- EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, |
+ EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
CHANNEL_LAYOUT_NONE, 0, 0, 0) |
.GetBytesPerSecond()); |
- EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, |
+ EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
CHANNEL_LAYOUT_STEREO, 0, 0, 0) |
.GetBytesPerSecond()); |
- EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, |
+ EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
CHANNEL_LAYOUT_NONE, 100, 0, 0) |
.GetBytesPerSecond()); |
- EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, |
+ EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
CHANNEL_LAYOUT_NONE, 0, 8, 0) |
.GetBytesPerSecond()); |
- EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, |
+ EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
CHANNEL_LAYOUT_STEREO, 100, 8, 0) |
.GetBytesPerSecond()); |
} |
TEST(AudioParameters, Compare) { |
AudioParameters values[] = { |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
- 1000, 8, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
- 1000, 8, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
- 1000, 16, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
- 1000, 16, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
- 2000, 8, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
- 2000, 8, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
- 2000, 16, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
- 2000, 16, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_MONO, 1000, 8, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_MONO, 1000, 8, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_MONO, 1000, 16, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_MONO, 1000, 16, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_MONO, 2000, 8, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_MONO, 2000, 8, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_MONO, 2000, 16, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_MONO, 2000, 16, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
- 1000, 8, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
- 1000, 8, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
- 1000, 16, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
- 1000, 16, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
- 2000, 8, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
- 2000, 8, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
- 2000, 16, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
- 2000, 16, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_STEREO, 1000, 8, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_STEREO, 1000, 8, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_STEREO, 1000, 16, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_STEREO, 1000, 16, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_STEREO, 2000, 8, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_STEREO, 2000, 8, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_STEREO, 2000, 16, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false, |
+ CHANNEL_LAYOUT_STEREO, 2000, 16, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO, |
- 1000, 8, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO, |
- 1000, 8, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO, |
- 1000, 16, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO, |
- 1000, 16, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO, |
- 2000, 8, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO, |
- 2000, 8, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO, |
- 2000, 16, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO, |
- 2000, 16, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
+ CHANNEL_LAYOUT_MONO, 1000, 8, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
+ CHANNEL_LAYOUT_MONO, 1000, 8, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
+ CHANNEL_LAYOUT_MONO, 1000, 16, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
+ CHANNEL_LAYOUT_MONO, 1000, 16, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
+ CHANNEL_LAYOUT_MONO, 2000, 8, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
+ CHANNEL_LAYOUT_MONO, 2000, 8, 200), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
+ CHANNEL_LAYOUT_MONO, 2000, 16, 100), |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
+ CHANNEL_LAYOUT_MONO, 2000, 16, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
CHANNEL_LAYOUT_STEREO, 1000, 8, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
CHANNEL_LAYOUT_STEREO, 1000, 8, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
CHANNEL_LAYOUT_STEREO, 1000, 16, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
CHANNEL_LAYOUT_STEREO, 1000, 16, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
CHANNEL_LAYOUT_STEREO, 2000, 8, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
CHANNEL_LAYOUT_STEREO, 2000, 8, 200), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
CHANNEL_LAYOUT_STEREO, 2000, 16, 100), |
- AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, |
+ AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, false, |
CHANNEL_LAYOUT_STEREO, 2000, 16, 200), |
}; |