Making AudioInputDeviceManager to return UnavailableDeviceParameters when there are no physical inp…

content/browser/renderer_host/media/audio_input_device_manager.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 "content/browser/renderer_host/media/audio_input_device_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 58 matching lines @@
 }
 
 int AudioInputDeviceManager::Open(const MediaStreamDevice& device) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // Generate a new id for this device.
   int session_id = next_capture_session_id_++;
 
   // base::Unretained(this) is safe, because AudioInputDeviceManager is
   // destroyed not earlier than on the IO message loop destruction.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseFakeDeviceForMediaStream)) {

[o1ka, 2017/06/22 09:32:34]

Alternatively we may check here if device.type is MEDIA_TAB_AUDIO_CAPTURE and
fallback to unavailable device parameters immediately. But this would change the
current behavior of returning real input device parameters for
MEDIA_TAB_AUDIO_CAPTURE device if physical input device exists.

     audio_system_->GetAssociatedOutputDeviceID(
         device.id,
         base::BindOnce(&AudioInputDeviceManager::OpenedOnIOThread,
                        base::Unretained(this), session_id, device,
                        base::TimeTicks::Now(),
                        media::AudioParameters::UnavailableDeviceParams(),
                        media::AudioParameters::UnavailableDeviceParams()));
   } else {
     // TODO(tommi): As is, we hit this code path when device.type is
     // MEDIA_TAB_AUDIO_CAPTURE and the device id is not a device that
@@ skipping 71 matching lines @@
     base::TimeTicks start_time,
     const media::AudioParameters& input_params,
     const media::AudioParameters& matched_output_params,
     const std::string& matched_output_device_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(GetDevice(session_id) == devices_.end());
 
   UMA_HISTOGRAM_TIMES("Media.AudioInputDeviceManager.OpenOnDeviceThreadTime",
                       base::TimeTicks::Now() - start_time);
 
+  media::AudioParameters valid_input_params(

[Guido Urdaneta, 2017/06/22 09:37:16]

nit: Use assignment syntax instead.

+      input_params.IsValid()
+          ? input_params
+          : media::AudioParameters::UnavailableDeviceParams());
+
   StreamDeviceInfo info(device.type, device.name, device.id);
   info.session_id = session_id;
-  info.device.input.sample_rate = input_params.sample_rate();
-  info.device.input.channel_layout = input_params.channel_layout();
-  info.device.input.frames_per_buffer = input_params.frames_per_buffer();
-  info.device.input.effects = input_params.effects();
-  info.device.input.mic_positions = input_params.mic_positions();
+  info.device.input.sample_rate = valid_input_params.sample_rate();
+  info.device.input.channel_layout = valid_input_params.channel_layout();
+  info.device.input.frames_per_buffer = valid_input_params.frames_per_buffer();
+  info.device.input.effects = valid_input_params.effects();
+  info.device.input.mic_positions = valid_input_params.mic_positions();
   info.device.matched_output_device_id = matched_output_device_id;
   info.device.matched_output.sample_rate = matched_output_params.sample_rate();
   info.device.matched_output.channel_layout =
       matched_output_params.channel_layout();
   info.device.matched_output.frames_per_buffer =
       matched_output_params.frames_per_buffer();
   info.device.matched_output.effects = matched_output_params.effects();
 
   devices_.push_back(info);
 
@@ skipping 22 matching lines @@
 
 #if defined(OS_CHROMEOS)
 void AudioInputDeviceManager::SetKeyboardMicStreamActiveOnUIThread(
     bool active) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   chromeos::CrasAudioHandler::Get()->SetKeyboardMicActive(active);
 }
 #endif
 
 }  // namespace content