Merge M57: "Always return CHANNEL_LAYOUT_UNSUPPORTED for unsupported layouts."

media/audio/win/core_audio_util_win.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/audio/win/core_audio_util_win.h"
 
 #include <devicetopology.h>
 #include <dxdiag.h>
 #include <functiondiscoverykeys_devpkey.h>
 #include <stddef.h>
@@ skipping 27 matching lines @@
 // Converts Microsoft's channel configuration to ChannelLayout.
 // This mapping is not perfect but the best we can do given the current
 // ChannelLayout enumerator and the Windows-specific speaker configurations
 // defined in ksmedia.h. Don't assume that the channel ordering in
 // ChannelLayout is exactly the same as the Windows specific configuration.
 // As an example: KSAUDIO_SPEAKER_7POINT1_SURROUND is mapped to
 // CHANNEL_LAYOUT_7_1 but the positions of Back L, Back R and Side L, Side R
 // speakers are different in these two definitions.
 static ChannelLayout ChannelConfigToChannelLayout(ChannelConfig config) {
   switch (config) {
-    case KSAUDIO_SPEAKER_DIRECTOUT:
-      DVLOG(2) << "KSAUDIO_SPEAKER_DIRECTOUT=>CHANNEL_LAYOUT_NONE";
-      return CHANNEL_LAYOUT_NONE;
     case KSAUDIO_SPEAKER_MONO:
       DVLOG(2) << "KSAUDIO_SPEAKER_MONO=>CHANNEL_LAYOUT_MONO";
       return CHANNEL_LAYOUT_MONO;
     case KSAUDIO_SPEAKER_STEREO:
       DVLOG(2) << "KSAUDIO_SPEAKER_STEREO=>CHANNEL_LAYOUT_STEREO";
       return CHANNEL_LAYOUT_STEREO;
     case KSAUDIO_SPEAKER_QUAD:
       DVLOG(2) << "KSAUDIO_SPEAKER_QUAD=>CHANNEL_LAYOUT_QUAD";
       return CHANNEL_LAYOUT_QUAD;
     case KSAUDIO_SPEAKER_SURROUND:
@@ skipping 13 matching lines @@
       return CHANNEL_LAYOUT_7_1;
     default:
       DVLOG(2) << "Unsupported channel configuration: " << config;
       return CHANNEL_LAYOUT_UNSUPPORTED;
   }
 }
 
 // TODO(henrika): add mapping for all types in the ChannelLayout enumerator.
 static ChannelConfig ChannelLayoutToChannelConfig(ChannelLayout layout) {
   switch (layout) {
-    case CHANNEL_LAYOUT_NONE:
-      DVLOG(2) << "CHANNEL_LAYOUT_NONE=>KSAUDIO_SPEAKER_UNSUPPORTED";
-      return KSAUDIO_SPEAKER_UNSUPPORTED;
-    case CHANNEL_LAYOUT_UNSUPPORTED:
-      DVLOG(2) << "CHANNEL_LAYOUT_UNSUPPORTED=>KSAUDIO_SPEAKER_UNSUPPORTED";
-      return KSAUDIO_SPEAKER_UNSUPPORTED;
     case CHANNEL_LAYOUT_MONO:
       DVLOG(2) << "CHANNEL_LAYOUT_MONO=>KSAUDIO_SPEAKER_MONO";
       return KSAUDIO_SPEAKER_MONO;
     case CHANNEL_LAYOUT_STEREO:
       DVLOG(2) << "CHANNEL_LAYOUT_STEREO=>KSAUDIO_SPEAKER_STEREO";
       return KSAUDIO_SPEAKER_STEREO;
     case CHANNEL_LAYOUT_QUAD:
       DVLOG(2) << "CHANNEL_LAYOUT_QUAD=>KSAUDIO_SPEAKER_QUAD";
       return KSAUDIO_SPEAKER_QUAD;
     case CHANNEL_LAYOUT_4_0:
@@ skipping 865 matching lines @@
 
   if (variant.type() == VT_BSTR && variant.ptr()->bstrVal) {
     base::WideToUTF8(variant.ptr()->bstrVal, wcslen(variant.ptr()->bstrVal),
                      driver_version);
   }
 
   return true;
 }
 
 }  // namespace media