Set up hdmi output device default volume to 100.

BUG=268438
TEST=hdmi output device should have maximum volume(100) be default.

Review URL: https://chromiumcodereview.appspot.com/23536034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222066 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 26 insertions, 30 deletions

diff --git a/chromeos/audio/audio_devices_pref_handler.h b/chromeos/audio/audio_devices_pref_handler.h
index d382218..417c4ec 100644
--- a/chromeos/audio/audio_devices_pref_handler.h
+++ b/chromeos/audio/audio_devices_pref_handler.h
@@ -25,7 +25,8 @@ class CHROMEOS_EXPORT AudioDevicesPrefHandler
   // Gets the audio output volume value from prefs for a device. Since we can
   // only have either a gain or a volume for a device (depending on whether it
   // is input or output), we don't really care which value it is.
-  virtual double GetVolumeGainValue(const AudioDevice& device) = 0;
+  virtual double GetOutputVolumeValue(const AudioDevice* device) = 0;
+  virtual double GetInputGainValue(const AudioDevice* device) = 0;
   // Sets the audio volume or gain value to prefs for a device.
   virtual void SetVolumeGainValue(const AudioDevice& device, double value) = 0;
 
diff --git a/chromeos/audio/audio_devices_pref_handler_stub.cc b/chromeos/audio/audio_devices_pref_handler_stub.cc
index 4f195ab..83b9aab 100644
--- a/chromeos/audio/audio_devices_pref_handler_stub.cc
+++ b/chromeos/audio/audio_devices_pref_handler_stub.cc
@@ -14,9 +14,18 @@ AudioDevicesPrefHandlerStub::AudioDevicesPrefHandlerStub() {
 AudioDevicesPrefHandlerStub::~AudioDevicesPrefHandlerStub() {
 }
 
-double AudioDevicesPrefHandlerStub::GetVolumeGainValue(
-    const AudioDevice& device) {
-  return audio_device_volume_gain_map_[device.id];
+double AudioDevicesPrefHandlerStub::GetOutputVolumeValue(
+    const AudioDevice* device) {
+  if (!device)
+    return 75.0;
+  return audio_device_volume_gain_map_[device->id];
+}
+
+double AudioDevicesPrefHandlerStub::GetInputGainValue(
+    const AudioDevice* device) {
+  if (!device)
+    return 0.0;
+  return audio_device_volume_gain_map_[device->id];
 }
 
 void AudioDevicesPrefHandlerStub::SetVolumeGainValue(const AudioDevice& device,
diff --git a/chromeos/audio/audio_devices_pref_handler_stub.h b/chromeos/audio/audio_devices_pref_handler_stub.h
index 5f585ed..5f07dc8 100644
--- a/chromeos/audio/audio_devices_pref_handler_stub.h
+++ b/chromeos/audio/audio_devices_pref_handler_stub.h
@@ -22,7 +22,8 @@ class CHROMEOS_EXPORT AudioDevicesPrefHandlerStub
 
   AudioDevicesPrefHandlerStub();
 
-  virtual double GetVolumeGainValue(const AudioDevice& device) OVERRIDE;
+  virtual double GetOutputVolumeValue(const AudioDevice* device) OVERRIDE;
+  virtual double GetInputGainValue(const AudioDevice* device) OVERRIDE;
   virtual void SetVolumeGainValue(const AudioDevice& device,
                                   double value) OVERRIDE;
   virtual bool GetMuteValue(const AudioDevice& device) OVERRIDE;
diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc
index 3fa81cb..9ed5253 100644
--- a/chromeos/audio/cras_audio_handler.cc
+++ b/chromeos/audio/cras_audio_handler.cc
@@ -134,9 +134,7 @@ int CrasAudioHandler::GetOutputVolumePercentForDevice(uint64 device_id) {
     return output_volume_;
   } else {
     const AudioDevice* device = GetDeviceFromId(device_id);
-    if (!device)
-      return kDefaultVolumeGainPercent;
-    return static_cast<int>(audio_pref_handler_->GetVolumeGainValue(*device));
+    return static_cast<int>(audio_pref_handler_->GetOutputVolumeValue(device));
   }
 }
 
@@ -149,9 +147,7 @@ int CrasAudioHandler::GetInputGainPercentForDevice(uint64 device_id) {
     return input_gain_;
   } else {
     const AudioDevice* device = GetDeviceFromId(device_id);
-    if (!device)
-      return kDefaultVolumeGainPercent;
-    return static_cast<int>(audio_pref_handler_->GetVolumeGainValue(*device));
+    return static_cast<int>(audio_pref_handler_->GetInputGainValue(device));
   }
 }
 
@@ -379,7 +375,7 @@ void CrasAudioHandler::SetupAudioInputState() {
     return;
   }
   input_mute_on_ = audio_pref_handler_->GetMuteValue(*device);
-  input_gain_ = audio_pref_handler_->GetVolumeGainValue(*device);
+  input_gain_ = audio_pref_handler_->GetInputGainValue(device);
   SetInputMuteInternal(input_mute_on_);
   // TODO(rkc,jennyz): Set input gain once we decide on how to store
   // the gain values since the range and step are both device specific.
@@ -393,7 +389,7 @@ void CrasAudioHandler::SetupAudioOutputState() {
     return;
   }
   output_mute_on_ = audio_pref_handler_->GetMuteValue(*device);
-  output_volume_ = audio_pref_handler_->GetVolumeGainValue(*device);
+  output_volume_ = audio_pref_handler_->GetOutputVolumeValue(device);
 
   SetOutputMuteInternal(output_mute_on_);
   SetOutputNodeVolume(active_output_node_id_, output_volume_);
diff --git a/chromeos/audio/cras_audio_handler.h b/chromeos/audio/cras_audio_handler.h
index b95f123..48e0376 100644
--- a/chromeos/audio/cras_audio_handler.h
+++ b/chromeos/audio/cras_audio_handler.h
@@ -20,17 +20,6 @@
 class PrefRegistrySimple;
 class PrefService;
 
-namespace {
-
-// Default value for the volume pref, as a percent in the range [0.0, 100.0].
-const double kDefaultVolumeGainPercent = 75.0;
-
-// Values used for muted preference.
-const int kPrefMuteOff = 0;
-const int kPrefMuteOn = 1;
-
-}  // namespace
-
 namespace chromeos {
 
 class AudioDevicesPrefHandler;
diff --git a/chromeos/audio/cras_audio_handler_unittest.cc b/chromeos/audio/cras_audio_handler_unittest.cc
index 48a1200..8d6468c 100644
--- a/chromeos/audio/cras_audio_handler_unittest.cc
+++ b/chromeos/audio/cras_audio_handler_unittest.cc
@@ -1075,7 +1075,7 @@ TEST_F(CrasAudioHandlerTest, SetOutputVolumePercent) {
   AudioDevice device;
   EXPECT_TRUE(cras_audio_handler_->GetActiveOutputDevice(&device));
   EXPECT_EQ(device.id, kInternalSpeaker.id);
-  EXPECT_EQ(kVolume, audio_pref_handler_->GetVolumeGainValue(device));
+  EXPECT_EQ(kVolume, audio_pref_handler_->GetOutputVolumeValue(&device));
 }
 
 TEST_F(CrasAudioHandlerTest, SetInputGainPercent) {
@@ -1093,7 +1093,7 @@ TEST_F(CrasAudioHandlerTest, SetInputGainPercent) {
   EXPECT_EQ(kGain, cras_audio_handler_->GetInputGainPercent());
   EXPECT_EQ(1, test_observer_->input_gain_changed_count());
   AudioDevice internal_mic(kInternalMic);
-  EXPECT_EQ(kGain, audio_pref_handler_->GetVolumeGainValue(internal_mic));
+  EXPECT_EQ(kGain, audio_pref_handler_->GetInputGainValue(&internal_mic));
 }
 
 TEST_F(CrasAudioHandlerTest, SetMuteForDevice) {
@@ -1161,7 +1161,7 @@ TEST_F(CrasAudioHandlerTest, SetVolumeGainPercentForDevice) {
                 kHeadphone.id));
   AudioDevice headphone(kHeadphone);
   EXPECT_EQ(kHeadphoneVolume,
-            audio_pref_handler_->GetVolumeGainValue(headphone));
+            audio_pref_handler_->GetOutputVolumeValue(&headphone));
 
   // Set volume percent for non-active output device.
   const int kSpeakerVolume = 60;
@@ -1174,7 +1174,7 @@ TEST_F(CrasAudioHandlerTest, SetVolumeGainPercentForDevice) {
                 kInternalSpeaker.id));
   AudioDevice speaker(kInternalSpeaker);
   EXPECT_EQ(kSpeakerVolume,
-            audio_pref_handler_->GetVolumeGainValue(speaker));
+            audio_pref_handler_->GetOutputVolumeValue(&speaker));
 
   // Set gain percent for active input device.
   const int kUSBMicGain = 30;
@@ -1187,7 +1187,7 @@ TEST_F(CrasAudioHandlerTest, SetVolumeGainPercentForDevice) {
             cras_audio_handler_->GetOutputVolumePercentForDevice(kUSBMic.id));
   AudioDevice usb_mic(kHeadphone);
   EXPECT_EQ(kUSBMicGain,
-            audio_pref_handler_->GetVolumeGainValue(usb_mic));
+            audio_pref_handler_->GetInputGainValue(&usb_mic));
 
   // Set gain percent for non-active input device.
   const int kInternalMicGain = 60;
@@ -1200,7 +1200,7 @@ TEST_F(CrasAudioHandlerTest, SetVolumeGainPercentForDevice) {
                 kInternalMic.id));
   AudioDevice internal_mic(kInternalMic);
   EXPECT_EQ(kInternalMicGain,
-            audio_pref_handler_->GetVolumeGainValue(internal_mic));
+            audio_pref_handler_->GetInputGainValue(&internal_mic));
 }
 
 TEST_F(CrasAudioHandlerTest, HandleOtherDeviceType) {