Revert 187936 "Pass more detailed audio hardware configuration i..."

media/base/channel_mixer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MSVC++ requires this to be set before any other includes to get M_SQRT1_2.
 #define _USE_MATH_DEFINES
 
 #include <cmath>
 
 #include "base/stringprintf.h"
 #include "media/base/audio_bus.h"
 #include "media/base/channel_mixer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 // Number of frames to test with.
 enum { kFrames = 16 };
 
 // Test all possible layout conversions can be constructed and mixed.
 TEST(ChannelMixerTest, ConstructAllPossibleLayouts) {
   for (ChannelLayout input_layout = CHANNEL_LAYOUT_MONO;
        input_layout < CHANNEL_LAYOUT_MAX;
        input_layout = static_cast<ChannelLayout>(input_layout + 1)) {
     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);
       scoped_ptr<AudioBus> input_bus = AudioBus::Create(
           ChannelLayoutToChannelCount(input_layout), kFrames);
       scoped_ptr<AudioBus> output_bus = AudioBus::Create(
           ChannelLayoutToChannelCount(output_layout), kFrames);
       for (int ch = 0; ch < input_bus->channels(); ++ch)
         std::fill(input_bus->channel(ch), input_bus->channel(ch) + kFrames, 1);
 
@@ skipping 76 matching lines @@
                          0.5f),
     ChannelMixerTestData(CHANNEL_LAYOUT_MONO, CHANNEL_LAYOUT_STEREO,
                          kMonoToStereoValues, arraysize(kMonoToStereoValues),
                          1.0f),
     ChannelMixerTestData(CHANNEL_LAYOUT_5_1, CHANNEL_LAYOUT_MONO,
                          kFiveOneToMonoValues, arraysize(kFiveOneToMonoValues),
                          static_cast<float>(M_SQRT1_2))
 ));
 
 }  // namespace media