Fix the bluetooth audio device id changing on the fly issue and the active device inconsistent issu…

chromeos/audio/cras_audio_handler.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/cras_audio_handler.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 
 // Default value for unmuting, as a percent in the range [0, 100].
 // Used when sound is unmuted, but volume was less than kMuteThresholdPercent.
 const int kDefaultUnmuteVolumePercent = 4;
 
 // Volume value which should be considered as muted in range [0, 100].
 const int kMuteThresholdPercent = 1;
 
 static CrasAudioHandler* g_cras_audio_handler = NULL;
 
+bool IsSameAudioDevice(const AudioDevice& a, const AudioDevice& b) {
+  return a.id == b.id && a.is_input == b.is_input && a.type == b.type

[rkc, 2013/09/16 22:38:11]

Shouldn't just comparing the id's be enough? IIRC, the device ID we get up to
Chrome is an OR of (device_id << 32 | node_id), which should make it unique?

[jennyz, 2013/09/16 22:47:03]

I am being extra careful here, after observing cras may behave unexpectedly in
some cases. This should not happen, but I am guarding it carefully just in case.

+      && a.device_name == b.device_name;
+}
+
 }  // namespace
 
 CrasAudioHandler::AudioObserver::AudioObserver() {
 }
 
 CrasAudioHandler::AudioObserver::~AudioObserver() {
 }
 
 void CrasAudioHandler::AudioObserver::OnOutputVolumeChanged() {
 }
@@ skipping 512 matching lines @@
   size_t num_old_devices = 0;
   size_t num_new_devices = 0;
   for (AudioDeviceMap::const_iterator it = audio_devices_.begin();
        it != audio_devices_.end(); ++it) {
     if (is_input == it->second.is_input)
       ++num_old_devices;
   }
 
   for (AudioNodeList::const_iterator it = new_nodes.begin();
        it != new_nodes.end(); ++it) {
-    if (is_input == it->is_input)
+    if (is_input == it->is_input) {
       ++num_new_devices;
+      // Look to see if the new device not in the old device list.
+      AudioDevice device(*it);
+      if (FoundNewDevice(device))
+        return true;
+    }
   }
   return num_old_devices != num_new_devices;
 }
 
+bool CrasAudioHandler::FoundNewDevice(const AudioDevice& device) {
+  const AudioDevice* device_found = GetDeviceFromId(device.id);
+  if (!device_found)
+    return true;
+
+  if (!IsSameAudioDevice(device, *device_found)) {
+    LOG(WARNING) << "Different Audio devices with same id:"
+        << " new device: " << device.ToString()
+        << " old device: " << device_found->ToString();
+    return true;
+  }
+  return false;
+}
+
 void CrasAudioHandler::UpdateDevicesAndSwitchActive(
     const AudioNodeList& nodes) {
   size_t old_audio_devices_size = audio_devices_.size();
   bool output_devices_changed = HasDeviceChange(nodes, false);
   bool input_devices_changed = HasDeviceChange(nodes, true);
   audio_devices_.clear();
   has_alternative_input_ = false;
   has_alternative_output_ = false;
 
   while (!input_devices_pq_.empty())
@@ skipping 49 matching lines @@
   UpdateDevicesAndSwitchActive(node_list);
   FOR_EACH_OBSERVER(AudioObserver, observers_, OnAudioNodesChanged());
 }
 
 void CrasAudioHandler::HandleGetNodesError(const std::string& error_name,
                                            const std::string& error_msg) {
   LOG_IF(ERROR, log_errors_) << "Failed to call GetNodes: "
       << error_name  << ": " << error_msg;
 }
 }  // namespace chromeos