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

media/base/channel_layout.cc

Index: media/base/channel_layout.cc
===================================================================
--- media/base/channel_layout.cc	(revision 189875)
+++ media/base/channel_layout.cc	(working copy)
@@ -39,7 +39,6 @@
     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
@@ -142,9 +141,6 @@
     // 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
 };
 
@@ -153,31 +149,6 @@
   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]));
Property changes on: media/base/channel_layout.cc
___________________________________________________________________
Deleted: svn:mergeinfo