Added a kEchoCancellation constraint to turn off the audio processing.

content/renderer/media/media_stream_audio_processor_options.cc

 // Copyright 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 "content/renderer/media/media_stream_audio_processor_options.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/media/media_stream_options.h"
+#include "content/renderer/media/media_stream_constraints_util.h"
 #include "content/renderer/media/rtc_media_constraints.h"
 #include "media/audio/audio_parameters.h"
-#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
-#include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.h"
 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h"
 #include "third_party/webrtc/modules/audio_processing/typing_detection.h"
 
 namespace content {
 
+const char MediaAudioConstraints::kEchoCancellation[] = "echoCancellation";
+const char MediaAudioConstraints::kGoogEchoCancellation[] =
+    "googEchoCancellation";
+const char MediaAudioConstraints::kGoogExperimentalEchoCancellation[] =
+    "googEchoCancellation2";
+const char MediaAudioConstraints::kGoogAutoGainControl[] =
+    "googAutoGainControl";
+const char MediaAudioConstraints::kGoogExperimentalAutoGainControl[] =
+    "googAutoGainControl2";
+const char MediaAudioConstraints::kGoogNoiseSuppression[] =
+    "googNoiseSuppression";
+const char MediaAudioConstraints::kGoogExperimentalNoiseSuppression[] =
+    "googNoiseSuppression2";
+const char MediaAudioConstraints::kGoogHighpassFilter[] = "googHighpassFilter";
+const char MediaAudioConstraints::kGoogTypingNoiseDetection[] =
+    "googTypingNoiseDetection";
+const char MediaAudioConstraints::kGoogAudioMirroring[] = "googAudioMirroring";
+
 namespace {
 
 // Constant constraint keys which enables default audio constraints on
 // mediastreams with audio.
 struct {
   const char* key;
-  const char* value;
+  bool value;
 } const kDefaultAudioConstraints[] = {
-  { webrtc::MediaConstraintsInterface::kEchoCancellation,
-    webrtc::MediaConstraintsInterface::kValueTrue },
+  { MediaAudioConstraints::kEchoCancellation, true },
+  { MediaAudioConstraints::kGoogEchoCancellation, true },
 #if defined(OS_CHROMEOS) || defined(OS_MACOSX)
   // Enable the extended filter mode AEC on platforms with known echo issues.
-  { webrtc::MediaConstraintsInterface::kExperimentalEchoCancellation,
-    webrtc::MediaConstraintsInterface::kValueTrue },
+  { MediaAudioConstraints::kGoogExperimentalEchoCancellation, true },
+#else
+  { MediaAudioConstraints::kGoogExperimentalEchoCancellation, false },
 #endif
-  { webrtc::MediaConstraintsInterface::kAutoGainControl,
-    webrtc::MediaConstraintsInterface::kValueTrue },
-  { webrtc::MediaConstraintsInterface::kExperimentalAutoGainControl,
-    webrtc::MediaConstraintsInterface::kValueTrue },
-  { webrtc::MediaConstraintsInterface::kNoiseSuppression,
-    webrtc::MediaConstraintsInterface::kValueTrue },
-  { webrtc::MediaConstraintsInterface::kHighpassFilter,
-    webrtc::MediaConstraintsInterface::kValueTrue },
-  { webrtc::MediaConstraintsInterface::kTypingNoiseDetection,
-    webrtc::MediaConstraintsInterface::kValueTrue },
+  { MediaAudioConstraints::kGoogAutoGainControl, true },
+  { MediaAudioConstraints::kGoogExperimentalAutoGainControl, true },
+  { MediaAudioConstraints::kGoogNoiseSuppression, true },
+  { MediaAudioConstraints::kGoogHighpassFilter, true },
+  { MediaAudioConstraints::kGoogTypingNoiseDetection, true },
+  { MediaAudioConstraints::kGoogExperimentalNoiseSuppression, false },
 #if defined(OS_WIN)
-  { content::kMediaStreamAudioDucking,
-    webrtc::MediaConstraintsInterface::kValueTrue },
+  { kMediaStreamAudioDucking, true },
+#else
+  { kMediaStreamAudioDucking, false },
 #endif
 };
 
+bool GetDefaultValueForConstraint(const blink::WebMediaConstraints& constraints,
+                                  const std::string& key) {
+  // The default audio processing is false for gUM with a specific
+  // kMediaStreamSource.

[perkj_chrome, 2014/04/14 12:15:19]

Please explain what kMediaSource is.

[no longer working on chromium, 2014/04/14 14:40:50]

Done with adding "which is used by tab capture and screen capture."
That is all I know.

+  std::string value;
+  if (GetConstraintValue(constraints, kMediaStreamSource, &value))
+    return false;
+
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kDefaultAudioConstraints); ++i) {

[perkj_chrome, 2014/04/14 12:15:19]

arraysize ?

[no longer working on chromium, 2014/04/14 14:40:50]

It is not possible before of the struct type used by kDefaultAudioConstraints.

+    if (kDefaultAudioConstraints[i].key == key)
+      return kDefaultAudioConstraints[i].value;
+  }
+
+  return false;
+}
+
 } // namespace
 
-void ApplyFixedAudioConstraints(RTCMediaConstraints* constraints) {
+// TODO(xians): Remove this method after the APM in WebRtc is deprecated.
+void MediaAudioConstraints::ApplyFixedAudioConstraints(
+    RTCMediaConstraints* constraints) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kDefaultAudioConstraints); ++i) {

[perkj_chrome, 2014/04/14 12:15:19]

arraysize ?

[no longer working on chromium, 2014/04/14 14:40:50]

ditto.

     bool already_set_value;
     if (!webrtc::FindConstraint(constraints, kDefaultAudioConstraints[i].key,
                                 &already_set_value, NULL)) {
-      constraints->AddOptional(kDefaultAudioConstraints[i].key,
-          kDefaultAudioConstraints[i].value, false);
+      const std::string value = kDefaultAudioConstraints[i].value ?
+          webrtc::MediaConstraintsInterface::kValueTrue :
+          webrtc::MediaConstraintsInterface::kValueFalse;
+      constraints->AddOptional(kDefaultAudioConstraints[i].key, value, false);
     } else {
       DVLOG(1) << "Constraint " << kDefaultAudioConstraints[i].key
                << " already set to " << already_set_value;
     }
   }
 }
 
-bool NeedsAudioProcessing(const blink::WebMediaConstraints& constraints,
-                          int effects) {
-  RTCMediaConstraints native_constraints(constraints);
-  ApplyFixedAudioConstraints(&native_constraints);
-  if (effects & media::AudioParameters::ECHO_CANCELLER) {
-    // If platform echo canceller is enabled, disable the software AEC.
-    native_constraints.AddOptional(
-        MediaConstraintsInterface::kEchoCancellation,
-        MediaConstraintsInterface::kValueFalse, true);
-  }
+MediaAudioConstraints::MediaAudioConstraints(
+    const blink::WebMediaConstraints& constraints, int effects)
+    : constraints_(constraints), effects_(effects) {}
+
+MediaAudioConstraints::~MediaAudioConstraints() {}
+
+// TODO(xians): Remove this method after the APM in WebRtc is deprecated.
+bool MediaAudioConstraints::NeedsAudioProcessing() {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kDefaultAudioConstraints); ++i) {
-    bool value = false;
-    if (webrtc::FindConstraint(&native_constraints,
-                               kDefaultAudioConstraints[i].key, &value, NULL) &&
-        value) {
+    if (GetProperty(kDefaultAudioConstraints[i].key))
       return true;
-    }
   }
 
   return false;
 }
 
-bool GetPropertyFromConstraints(const MediaConstraintsInterface* constraints,
-                                const std::string& key) {
+bool MediaAudioConstraints::GetProperty(const std::string& key) {
+  if (effects_ & media::AudioParameters::ECHO_CANCELLER &&

[no longer working on chromium, 2014/04/11 16:47:05]

Andrew, could you please take a look at this?

Previously, we mapped a const blink::WebMediaConstraints object into a writable
RTCMediaConstraints object, so we could modify the RTC constraints when the
effect was enabled, but we can't do it any more, so I simply return false for
kGoogEchoCancellation when the effect is enabled.

+      key == kGoogEchoCancellation) {
+    // If platform echo canceller is enabled, disable the software AEC.
+    return false;
+  }
+
+  // Return the value if the constraint is specified in |constraints|,
+  // otherwise return the default value.
   bool value = false;
-  return webrtc::FindConstraint(constraints, key, &value, NULL) && value;
+  if (!GetConstraintValue(constraints_, key, &value))
+    value = GetDefaultValueForConstraint(constraints_, key);
+
+  return value;
+}
+
+bool MediaAudioConstraints::IsValid() {
+  blink::WebVector<blink::WebMediaConstraint> mandatory;
+  constraints_.getMandatoryConstraints(mandatory);
+  for (size_t i = 0; i < mandatory.size(); ++i) {
+    if (mandatory[i].m_name.utf8() == kMediaStreamSource)
+      continue;
+
+    bool valid = false;
+    for (size_t j = 0; j < ARRAYSIZE_UNSAFE(kDefaultAudioConstraints); ++j) {
+      if (mandatory[i].m_name.utf8() == kDefaultAudioConstraints[j].key) {
+        valid = true;
+        break;
+      }
+    }
+
+    if (!valid) {
+      DLOG(ERROR) << "Invalid MediaStream constraint. Name:"
+                  <<  mandatory[i].m_name.utf8();
+      return false;
+    }
+  }
+
+  return true;
 }
 
 void EnableEchoCancellation(AudioProcessing* audio_processing) {
 #if defined(OS_ANDROID)
   // Mobile devices are using AECM.
   int err = audio_processing->echo_control_mobile()->set_routing_mode(
       webrtc::EchoControlMobile::kSpeakerphone);
   err |= audio_processing->echo_control_mobile()->Enable(true);
   CHECK_EQ(err, 0);
 #else
@@ skipping 16 matching lines @@
 }
 
 void EnableExperimentalNoiseSuppression(AudioProcessing* audio_processing) {
   CHECK_EQ(audio_processing->EnableExperimentalNs(true), 0);
 }
 
 void EnableHighPassFilter(AudioProcessing* audio_processing) {
   CHECK_EQ(audio_processing->high_pass_filter()->Enable(true), 0);
 }
 
 void EnableTypingDetection(AudioProcessing* audio_processing,

[perkj_chrome, 2014/04/14 12:15:19]

nit: allign paramers or move audio_processing to next line.

[no longer working on chromium, 2014/04/14 14:40:50]

Done.

-                           webrtc::TypingDetection* typing_detector) {
+    webrtc::TypingDetection* typing_detector) {
   int err = audio_processing->voice_detection()->Enable(true);
   err |= audio_processing->voice_detection()->set_likelihood(
       webrtc::VoiceDetection::kVeryLowLikelihood);
   CHECK_EQ(err, 0);
 
   // Configure the update period to 1s (100 * 10ms) in the typing detector.
   typing_detector->SetParameters(0, 0, 0, 0, 0, 100);
 }
 
 void EnableExperimentalEchoCancellation(AudioProcessing* audio_processing) {
   webrtc::Config config;
   config.Set<webrtc::DelayCorrection>(new webrtc::DelayCorrection(true));
   audio_processing->SetExtraOptions(config);
 }
 
 void StartEchoCancellationDump(AudioProcessing* audio_processing,
-                               const base::PlatformFile& aec_dump_file) {
+    const base::PlatformFile& aec_dump_file) {

[perkj_chrome, 2014/04/14 12:15:19]

dio

[no longer working on chromium, 2014/04/14 14:40:50]

Done.

   DCHECK_NE(aec_dump_file, base::kInvalidPlatformFileValue);
 
   FILE* stream = base::FdopenPlatformFile(aec_dump_file, "w");
   if (!stream) {
     LOG(ERROR) << "Failed to open AEC dump file";
     return;
   }
 
   if (audio_processing->StartDebugRecording(stream))
     DLOG(ERROR) << "Fail to start AEC debug recording";
@@ skipping 48 matching lines @@
   }
 
   int median = 0, std = 0;
   if (!audio_processing->echo_cancellation()->GetDelayMetrics(&median, &std)) {
     stats->echo_delay_median_ms = median;
     stats->echo_delay_std_ms = std;
   }
 }
 
 }  // namespace content