Add new mic types

chromeos/audio/audio_device.cc

 // Copyright (c) 2013 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 "chromeos/audio/audio_device.h"
 
 #include <stdint.h>
 
 #include "base/format_macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 16 matching lines @@
     case AUDIO_TYPE_HEADPHONE:
     case AUDIO_TYPE_LINEOUT:
     case AUDIO_TYPE_MIC:
     case AUDIO_TYPE_USB:
     case AUDIO_TYPE_BLUETOOTH:
       return 3;
     case AUDIO_TYPE_HDMI:
       return 2;
     case AUDIO_TYPE_INTERNAL_SPEAKER:
     case AUDIO_TYPE_INTERNAL_MIC:
+    case AUDIO_TYPE_FRONT_MIC:
       return 1;
+    case AUDIO_TYPE_REAR_MIC:

[hshi1, 2017/01/06 18:41:23]

why is the FRONT_MIC assigned priority "1" but REAR_MIC priority "0"?

there must be a very good reason for this so if you could comment in the CL
description that would be nice

[jennyz, 2017/01/06 19:31:16]

Yes, same question as hshi, please comment for the reason.

[hychao, 2017/01/09 03:17:35]

Added comment for this. The idea is the same as setting BT input to priority=0
above. For those mics not for normal use case, we set priority to zero to avoid
auto node selection jumps to a special mic and user doesn't notice that.

     case AUDIO_TYPE_KEYBOARD_MIC:
     case AUDIO_TYPE_HOTWORD:
     case AUDIO_TYPE_POST_MIX_LOOPBACK:
     case AUDIO_TYPE_POST_DSP_LOOPBACK:
     case AUDIO_TYPE_OTHER:
     default:
       return 0;
   }
 }
 
 }  // namespace
 
 // static
 std::string AudioDevice::GetTypeString(AudioDeviceType type) {
   switch (type) {
     case AUDIO_TYPE_HEADPHONE:
       return "HEADPHONE";
     case AUDIO_TYPE_MIC:
       return "MIC";
     case AUDIO_TYPE_USB:
       return "USB";
     case AUDIO_TYPE_BLUETOOTH:
       return "BLUETOOTH";
     case AUDIO_TYPE_HDMI:
       return "HDMI";
     case AUDIO_TYPE_INTERNAL_SPEAKER:
       return "INTERNAL_SPEAKER";
     case AUDIO_TYPE_INTERNAL_MIC:
       return "INTERNAL_MIC";
+    case AUDIO_TYPE_FRONT_MIC:
+      return "FRONT_MIC";
+    case AUDIO_TYPE_REAR_MIC:
+      return "REAR_MIC";
     case AUDIO_TYPE_KEYBOARD_MIC:
       return "KEYBOARD_MIC";
     case AUDIO_TYPE_HOTWORD:
       return "HOTWORD";
     case AUDIO_TYPE_LINEOUT:
       return "LINEOUT";
     case AUDIO_TYPE_POST_MIX_LOOPBACK:
       return "POST_MIX_LOOPBACK";
     case AUDIO_TYPE_POST_DSP_LOOPBACK:
       return "POST_DSP_LOOPBACK";
     case AUDIO_TYPE_OTHER:
     default:
       return "OTHER";
   }
 }
 
 // static
 AudioDeviceType AudioDevice::GetAudioType(
     const std::string& node_type) {
   if (node_type.find("HEADPHONE") != std::string::npos)
     return AUDIO_TYPE_HEADPHONE;
   else if (node_type.find("INTERNAL_MIC") != std::string::npos)
     return AUDIO_TYPE_INTERNAL_MIC;
+  else if (node_type.find("FRONT_MIC") != std::string::npos)
+    return AUDIO_TYPE_FRONT_MIC;
+  else if (node_type.find("REAR_MIC") != std::string::npos)
+    return AUDIO_TYPE_REAR_MIC;
   else if (node_type.find("KEYBOARD_MIC") != std::string::npos)
     return AUDIO_TYPE_KEYBOARD_MIC;
   else if (node_type.find("MIC") != std::string::npos)
     return AUDIO_TYPE_MIC;
   else if (node_type.find("USB") != std::string::npos)
     return AUDIO_TYPE_USB;
   else if (node_type.find("BLUETOOTH") != std::string::npos)
     return AUDIO_TYPE_BLUETOOTH;
   else if (node_type.find("HDMI") != std::string::npos)
     return AUDIO_TYPE_HDMI;
@@ skipping 68 matching lines @@
                       active ? "true" : "false");
   base::StringAppendF(&result,
                       "plugged_time= %s ",
                       base::Uint64ToString(plugged_time).c_str());
   base::StringAppendF(&result, "mic_positions = %s ", mic_positions.c_str());
 
   return result;
 }
 
 }  // namespace chromeos