Count the SetOutputNodeVolume requests sent during the audio initialization and track them with the…

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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 595 matching lines @@
 
   // Sync internal volume state and notify UI for the change. We trust cras
   // signal to report the volume state of the device, no matter which source
   // set the volume, i.e., volume could be set from non-chrome source, like
   // Bluetooth headset, etc. Assume all active output devices share a single
   // volume.
   output_volume_ = volume;
   audio_pref_handler_->SetVolumeGainValue(*device, volume);
 
   if (initializing_audio_state_) {
-    // Reset the flag after the first OutputNodeVolumeChanged, just in case
-    // cras didn't respond to the initial SetOutputNodeVolume request.
-    initializing_audio_state_ = false;
     // Do not notify the observers for volume changed event if CrasAudioHandler
-    // is initializing its state, i.e., the volume change event is not from
-    // user action, no need to notify UI to pop uo the volume slider bar.
-    if (init_node_id_ == node_id && init_volume_ ==  volume)
+    // is initializing its state, i.e., the volume change event is in responding
+    // to SetOutputNodeVolume request from intializaing audio state, not
+    // from user action, no need to notify UI to pop uo the volume slider bar.
+    if (init_node_id_ == node_id && init_volume_ == volume) {
+      init_volume_count_--;
+      if (!init_volume_count_)
+        initializing_audio_state_ = false;
       return;
+    } else {
+      // Reset the initializing_audio_state_ in case SetOutputNodeVolume request
+      // is lost by cras due to cras is not ready when CrasAudioHandler is being
+      // initialized.
+      initializing_audio_state_ = false;
+      init_volume_count_ = 0;
+    }
   }
 
   FOR_EACH_OBSERVER(AudioObserver, observers_,
                     OnOutputNodeVolumeChanged(node_id, volume));
 }
 
 void CrasAudioHandler::ActiveOutputNodeChanged(uint64_t node_id) {
   if (active_output_node_id_ == node_id)
     return;
 
@@ skipping 89 matching lines @@
     VLOG(1) << "Mute the output during HDMI re-discovering grace period";
     output_mute_on_ = true;
   } else {
     output_mute_on_ = audio_pref_handler_->GetMuteValue(*device);
   }
   output_volume_ = audio_pref_handler_->GetOutputVolumeValue(device);
 
   SetOutputMuteInternal(output_mute_on_);
 
   if (initializing_audio_state_) {
+    // During power up, InitializeAudioState() could be called twice, first
+    // by CrasAudioHandler constructor, then by cras server restarting signal,
+    // both sending SetOutputNodeVolume requests, and could lead to two
+    // OutputNodeVolumeChanged signals.
+    init_volume_count_++;
     init_node_id_ = active_output_node_id_;
     init_volume_ = output_volume_;
   }
   SetOutputNodeVolume(active_output_node_id_, output_volume_);
 }
 
 // This sets up the state of an additional active node.
 void CrasAudioHandler::SetupAdditionalActiveAudioNodeState(uint64_t node_id) {
   const AudioDevice* device = GetDeviceFromId(node_id);
   if (!device) {
@@ skipping 603 matching lines @@
                      hdmi_rediscover_grace_period_duration_in_ms_),
       this, &CrasAudioHandler::UpdateAudioAfterHDMIRediscoverGracePeriod);
 }
 
 void CrasAudioHandler::SetHDMIRediscoverGracePeriodForTesting(
     int duration_in_ms) {
   hdmi_rediscover_grace_period_duration_in_ms_ = duration_in_ms;
 }
 
 }  // namespace chromeos