diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
| commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd (patch) | |
| tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae /media/base/channel_mixer_unittest.cc | |
| parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e (diff) | |
| download | chromium_org-2a99a7e74a7f215066514fe81d2bfa6639d9eddd.tar.gz | |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
Diffstat (limited to 'media/base/channel_mixer_unittest.cc')
| -rw-r--r-- | media/base/channel_mixer_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/base/channel_mixer_unittest.cc b/media/base/channel_mixer_unittest.cc index a71f86bb54..3e44409db5 100644 --- a/media/base/channel_mixer_unittest.cc +++ b/media/base/channel_mixer_unittest.cc @@ -25,6 +25,11 @@ TEST(ChannelMixerTest, ConstructAllPossibleLayouts) { for (ChannelLayout output_layout = CHANNEL_LAYOUT_MONO; output_layout < CHANNEL_LAYOUT_STEREO_DOWNMIX; output_layout = static_cast<ChannelLayout>(output_layout + 1)) { + // DISCRETE can't be tested here based on the current approach. + if (input_layout == CHANNEL_LAYOUT_DISCRETE || + output_layout == CHANNEL_LAYOUT_DISCRETE) + continue; + SCOPED_TRACE(base::StringPrintf( "Input Layout: %d, Output Layout: %d", input_layout, output_layout)); ChannelMixer mixer(input_layout, output_layout); |