Enable new getUserMedia audio constraints algorithm behind a flag.

content/renderer/media/webrtc/processed_local_audio_source.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/renderer/media/webrtc/processed_local_audio_source.h"
 
+#include <algorithm>
+#include <utility>
+
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/media_stream_audio_processor_options.h"
 #include "content/renderer/media/media_stream_constraints_util.h"
 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 #include "content/renderer/media/webrtc_logging.h"
 #include "content/renderer/render_frame_impl.h"
 #include "media/audio/sample_rates.h"
 #include "media/base/channel_layout.h"
 #include "third_party/webrtc/api/mediaconstraintsinterface.h"
 #include "third_party/webrtc/media/base/mediachannel.h"
 
 namespace content {
 
 namespace {
 // Used as an identifier for ProcessedLocalAudioSource::From().
 void* const kClassIdentifier = const_cast<void**>(&kClassIdentifier);
 }  // namespace
 
 ProcessedLocalAudioSource::ProcessedLocalAudioSource(
     int consumer_render_frame_id,
     const StreamDeviceInfo& device_info,
-    const blink::WebMediaConstraints& constraints,
+    const AudioProcessingProperties& audio_processing_properties,
     const ConstraintsCallback& started_callback,
     PeerConnectionDependencyFactory* factory)
     : MediaStreamAudioSource(true /* is_local_source */),
       consumer_render_frame_id_(consumer_render_frame_id),
       pc_factory_(factory),
-      constraints_(constraints),
+      audio_processing_properties_(audio_processing_properties),
       started_callback_(started_callback),
       volume_(0),
       allow_invalid_render_frame_id_for_testing_(false) {
   DCHECK(pc_factory_);
   DVLOG(1) << "ProcessedLocalAudioSource::ProcessedLocalAudioSource()";
   MediaStreamSource::SetDeviceInfo(device_info);
 }
 
 ProcessedLocalAudioSource::~ProcessedLocalAudioSource() {
   DVLOG(1) << "ProcessedLocalAudioSource::~ProcessedLocalAudioSource()";
@@ skipping 35 matching lines @@
       ", channel_layout=%d, sample_rate=%d, buffer_size=%d"
       ", session_id=%d, paired_output_sample_rate=%d"
       ", paired_output_frames_per_buffer=%d, effects=%d. ",
       consumer_render_frame_id_, device_info().device.input.channel_layout,
       device_info().device.input.sample_rate,
       device_info().device.input.frames_per_buffer, device_info().session_id,
       device_info().device.matched_output.sample_rate,
       device_info().device.matched_output.frames_per_buffer,
       device_info().device.input.effects));
 
-  // Sanity-check that the constraints, plus the additional input effects are
-  // valid when combined.
-  const MediaAudioConstraints audio_constraints(
-      constraints_, device_info().device.input.effects);
-  if (!audio_constraints.IsValid()) {

[hbos_chromium, 2017/06/16 17:27:14]

Is the concept of "not valid" not applicable to properties?

[Guido Urdaneta, 2017/06/19 11:56:49]

No, it's not.

-    WebRtcLogMessage("ProcessedLocalAudioSource::EnsureSourceIsStarted() fails "
-                     " because MediaAudioConstraints are not valid.");
-    return false;
-  }
-
-  if (device_info().device.input.effects &
-      media::AudioParameters::ECHO_CANCELLER) {
-    // TODO(hta): Figure out if we should be looking at echoCancellation.
-    // Previous code had googEchoCancellation only.
-    const blink::BooleanConstraint& echoCancellation =
-        constraints_.Basic().goog_echo_cancellation;
-    if (echoCancellation.HasExact() && !echoCancellation.Exact()) {
-      StreamDeviceInfo modified_device_info(device_info());
-      modified_device_info.device.input.effects &=
-          ~media::AudioParameters::ECHO_CANCELLER;
-      SetDeviceInfo(modified_device_info);
-    }
+  // Disable HW echo cancellation if constraints explicitly specified no
+  // echo cancellation.
+  if (audio_processing_properties_.disable_hw_echo_cancellation &&
+      (device_info().device.input.effects &
+       media::AudioParameters::ECHO_CANCELLER)) {
+    StreamDeviceInfo modified_device_info(device_info());
+    modified_device_info.device.input.effects &=
+        ~media::AudioParameters::ECHO_CANCELLER;
+    SetDeviceInfo(modified_device_info);
   }
 
   // Create the MediaStreamAudioProcessor, bound to the WebRTC audio device
   // module.
   WebRtcAudioDeviceImpl* const rtc_audio_device =
       pc_factory_->GetWebRtcAudioDevice();
   if (!rtc_audio_device) {
     WebRtcLogMessage("ProcessedLocalAudioSource::EnsureSourceIsStarted() fails "
                      " because there is no WebRtcAudioDeviceImpl instance.");
     return false;
   }
   audio_processor_ = new rtc::RefCountedObject<MediaStreamAudioProcessor>(
-      constraints_, device_info().device.input, rtc_audio_device);
+      audio_processing_properties_, rtc_audio_device);
 
   // If KEYBOARD_MIC effect is set, change the layout to the corresponding
   // layout that includes the keyboard mic.
   media::ChannelLayout channel_layout = static_cast<media::ChannelLayout>(
       device_info().device.input.channel_layout);
   if ((device_info().device.input.effects &
        media::AudioParameters::KEYBOARD_MIC) &&
-      audio_constraints.GetGoogExperimentalNoiseSuppression()) {
+      audio_processing_properties_.goog_experimental_noise_suppression) {
     if (channel_layout == media::CHANNEL_LAYOUT_STEREO) {
       channel_layout = media::CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC;
       DVLOG(1) << "Changed stereo layout to stereo + keyboard mic layout due "
                << "to KEYBOARD_MIC effect.";
     } else {
       DVLOG(1) << "KEYBOARD_MIC effect ignored, not compatible with layout "
                << channel_layout;
     }
   }
 
@@ skipping 220 matching lines @@
 
   // If the buffer size is missing from the StreamDeviceInfo, provide 10ms as a
   // fall-back.
   //
   // TODO(miu): Identify where/why the buffer size might be missing, fix the
   // code, and then require it here. http://crbug.com/638081
   return (sample_rate / 100);
 }
 
 }  // namespace content