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

media/base/channel_layout.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.
 
 #include "media/base/channel_layout.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 
 namespace media {
@@ skipping 21 matching lines @@
     5,   // CHANNEL_LAYOUT_4_1
     6,   // CHANNEL_LAYOUT_6_0
     6,   // CHANNEL_LAYOUT_6_0_FRONT
     6,   // CHANNEL_LAYOUT_HEXAGONAL
     7,   // CHANNEL_LAYOUT_6_1
     7,   // CHANNEL_LAYOUT_6_1_BACK
     7,   // CHANNEL_LAYOUT_6_1_FRONT
     7,   // CHANNEL_LAYOUT_7_0_FRONT
     8,   // CHANNEL_LAYOUT_7_1_WIDE_BACK
     8,   // CHANNEL_LAYOUT_OCTAGONAL
-    0,   // CHANNEL_LAYOUT_DISCRETE
 };
 
 // The channel orderings for each layout as specified by FFmpeg.  Each value
 // represents the index of each channel in each layout.  Values of -1 mean the
 // channel at that index is not used for that layout.For example, the left side
 // surround sound channel in FFmpeg's 5.1 layout is in the 5th position (because
 // the order is L, R, C, LFE, LS, RS), so
 // kChannelOrderings[CHANNEL_LAYOUT_5POINT1][SIDE_LEFT] = 4;
 static const int kChannelOrderings[CHANNEL_LAYOUT_MAX][CHANNELS_MAX] = {
     // FL | FR | FC | LFE | BL | BR | FLofC | FRofC | BC | SL | SR
@@ skipping 82 matching lines @@
 
     // CHANNEL_LAYOUT_7_0_FRONT
     {  0  , 1  , 2  , -1  , -1 , -1 , 5     , 6     , -1 , 3  ,  4 },
 
     // CHANNEL_LAYOUT_7_1_WIDE_BACK
     {  0  , 1  , 2  , 3   , 4  , 5  , 6     , 7     , -1 , -1 , -1 },
 
     // CHANNEL_LAYOUT_OCTAGONAL
     {  0  , 1  , 2  , -1  , 5  , 6  , -1    , -1    ,  7 , 3  ,  4 },
 
-    // CHANNEL_LAYOUT_DISCRETE
-    {  -1 , -1 , -1 , -1  , -1 , -1 , -1    , -1    , -1 , -1 , -1 },
-
     // FL | FR | FC | LFE | BL | BR | FLofC | FRofC | BC | SL | SR
 };
 
 int ChannelLayoutToChannelCount(ChannelLayout layout) {
   DCHECK_LT(static_cast<size_t>(layout), arraysize(kLayoutToChannels));
   return kLayoutToChannels[layout];
 }
 
-// Converts a channel count into a channel layout.
-ChannelLayout GuessChannelLayout(int channels) {
-  switch (channels) {
-    case 1:
-      return CHANNEL_LAYOUT_MONO;
-    case 2:
-      return CHANNEL_LAYOUT_STEREO;
-    case 3:
-      return CHANNEL_LAYOUT_SURROUND;
-    case 4:
-      return CHANNEL_LAYOUT_QUAD;
-    case 5:
-      return CHANNEL_LAYOUT_5_0;
-    case 6:
-      return CHANNEL_LAYOUT_5_1;
-    case 7:
-      return CHANNEL_LAYOUT_6_1;
-    case 8:
-      return CHANNEL_LAYOUT_7_1;
-    default:
-      DVLOG(1) << "Unsupported channel count: " << channels;
-  }
-  return CHANNEL_LAYOUT_UNSUPPORTED;
-}
-
 int ChannelOrder(ChannelLayout layout, Channels channel) {
   DCHECK_LT(static_cast<size_t>(layout), arraysize(kChannelOrderings));
   DCHECK_LT(static_cast<size_t>(channel), arraysize(kChannelOrderings[0]));
   return kChannelOrderings[layout][channel];
 }
 
 }  // namespace media