[getUserMedia] Removal of non-standard googTypingNoiseDetection const…

…raint.

The non-standard googTypingNoiseDetection is a constraint that is used
to enable or disable getStats behavior, rather than controlling processing.
This means that enabling or disabling this non-standard constraint only
affects a non-standard stat behavior.

Further, looking at the usage of the constraint internally and externally,
the flag is almost always disabled.

This CL silently removes the constraint by removing the processing logic
in the select-settings algorithm and sets the flag associated to
typing noise detection to off (false).

BUG=924485

Change-Id: Id2a0696b3264c985d170e8c7afac1c228a7fa4e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1617352
Commit-Queue: Armando Miraglia <armax@chromium.org>
Reviewed-by: Philip Jägenstedt <foolip@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662156}

content/renderer/media/stream/media_stream_audio_processor_unittest.cc

@@ -161,14 +161,13 @@ class MediaStreamAudioProcessorTest : public ::testing::Test {
     EXPECT_TRUE(config.high_pass_filter.enabled);
     EXPECT_TRUE(config.noise_suppression.enabled);
     EXPECT_EQ(config.noise_suppression.level, config.noise_suppression.kHigh);
+    EXPECT_FALSE(config.voice_detection.enabled);
 #if defined(OS_ANDROID)
     EXPECT_TRUE(config.echo_canceller.mobile_mode);
-    EXPECT_FALSE(config.voice_detection.enabled);
     EXPECT_EQ(config.gain_controller1.mode,
               config.gain_controller1.kFixedDigital);
 #else
     EXPECT_FALSE(config.echo_canceller.mobile_mode);
-    EXPECT_TRUE(config.voice_detection.enabled);
     EXPECT_EQ(config.gain_controller1.mode,
               config.gain_controller1.kAdaptiveAnalog);
 #endif

content/renderer/media/stream/media_stream_constraints_util_audio.cc

@@ -384,7 +384,6 @@ class EchoCancellationContainer {
     properties->goog_auto_gain_control &= default_audio_processing_value;
     properties->goog_experimental_echo_cancellation &=
         default_audio_processing_value;
-    properties->goog_typing_noise_detection &= default_audio_processing_value;
     properties->goog_noise_suppression &= default_audio_processing_value;
     properties->goog_experimental_noise_suppression &=
         default_audio_processing_value;
@@ -618,7 +617,6 @@ class ProcessingBasedContainer {
         BoolSet(), /* goog_audio_mirroring_set */
         BoolSet(), /* goog_auto_gain_control_set */
         BoolSet(), /* goog_experimental_echo_cancellation_set */
-        BoolSet(), /* goog_typing_noise_detection_set */
         BoolSet(), /* goog_noise_suppression_set */
         BoolSet(), /* goog_experimental_noise_suppression_set */
         BoolSet(), /* goog_highpass_filter_set */
@@ -647,7 +645,6 @@ class ProcessingBasedContainer {
         BoolSet(), /* goog_audio_mirroring_set */
         BoolSet(), /* goog_auto_gain_control_set */
         BoolSet(), /* goog_experimental_echo_cancellation_set */
-        BoolSet(), /* goog_typing_noise_detection_set */
         BoolSet(), /* goog_noise_suppression_set */
         BoolSet(), /* goog_experimental_noise_suppression_set */
         BoolSet(), /* goog_highpass_filter_set */
@@ -674,7 +671,6 @@ class ProcessingBasedContainer {
         BoolSet(),        /* goog_audio_mirroring_set */
         BoolSet({false}), /* goog_auto_gain_control_set */
         BoolSet({false}), /* goog_experimental_echo_cancellation_set */
-        BoolSet({false}), /* goog_typing_noise_detection_set */
         BoolSet({false}), /* goog_noise_suppression_set */
         BoolSet({false}), /* goog_experimental_noise_suppression_set */
         BoolSet({false}), /* goog_highpass_filter_set */
@@ -701,7 +697,6 @@ class ProcessingBasedContainer {
         BoolSet({false}), /* goog_audio_mirroring_set */
         BoolSet({false}), /* goog_auto_gain_control_set */
         BoolSet({false}), /* goog_experimental_echo_cancellation_set */
-        BoolSet({false}), /* goog_typing_noise_detection_set */
         BoolSet({false}), /* goog_noise_suppression_set */
         BoolSet({false}), /* goog_experimental_noise_suppression_set */
         BoolSet({false}), /* goog_highpass_filter_set */
@@ -843,7 +838,6 @@ class ProcessingBasedContainer {
     kGoogAudioMirroring,
     kGoogAutoGainControl,
     kGoogExperimentalEchoCancellation,
-    kGoogTypingNoiseDetection,
     kGoogNoiseSuppression,
     kGoogExperimentalNoiseSuppression,
     kGoogHighpassFilter,
@@ -870,9 +864,6 @@ class ProcessingBasedContainer {
           {kGoogExperimentalEchoCancellation,
            &ConstraintSet::goog_experimental_echo_cancellation,
            &AudioProcessingProperties::goog_experimental_echo_cancellation},
-          {kGoogTypingNoiseDetection,
-           &ConstraintSet::goog_typing_noise_detection,
-           &AudioProcessingProperties::goog_typing_noise_detection},
           {kGoogNoiseSuppression, &ConstraintSet::goog_noise_suppression,
            &AudioProcessingProperties::goog_noise_suppression},
           {kGoogExperimentalNoiseSuppression,
@@ -896,7 +887,6 @@ class ProcessingBasedContainer {
       BoolSet goog_audio_mirroring_set,
       BoolSet goog_auto_gain_control_set,
       BoolSet goog_experimental_echo_cancellation_set,
-      BoolSet goog_typing_noise_detection_set,
       BoolSet goog_noise_suppression_set,
       BoolSet goog_experimental_noise_suppression_set,
       BoolSet goog_highpass_filter_set,
@@ -931,8 +921,6 @@ class ProcessingBasedContainer {
         BooleanContainer(goog_auto_gain_control_set);
     boolean_containers_[kGoogExperimentalEchoCancellation] =
         BooleanContainer(goog_experimental_echo_cancellation_set);
-    boolean_containers_[kGoogTypingNoiseDetection] =
-        BooleanContainer(goog_typing_noise_detection_set);
     boolean_containers_[kGoogNoiseSuppression] =
         BooleanContainer(goog_noise_suppression_set);
     boolean_containers_[kGoogExperimentalNoiseSuppression] =

content/renderer/media/stream/media_stream_constraints_util_audio_unittest.cc

@@ -201,10 +201,6 @@ class MediaStreamConstraintsUtilAudioTestBase {
             &AudioProcessingProperties::goog_experimental_echo_cancellation)) {
       CheckGoogExperimentalEchoCancellationDefault(properties, true);
     }
-    if (!Contains(exclude_audio_properties,
-                  &AudioProcessingProperties::goog_typing_noise_detection)) {
-      EXPECT_TRUE(properties.goog_typing_noise_detection);
-    }
     if (!Contains(exclude_audio_properties,
                   &AudioProcessingProperties::goog_noise_suppression)) {
       EXPECT_TRUE(properties.goog_noise_suppression);
@@ -253,10 +249,6 @@ class MediaStreamConstraintsUtilAudioTestBase {
             &AudioProcessingProperties::goog_experimental_echo_cancellation)) {
       EXPECT_FALSE(properties.goog_experimental_echo_cancellation);
     }
-    if (!Contains(exclude_audio_properties,
-                  &AudioProcessingProperties::goog_typing_noise_detection)) {
-      EXPECT_FALSE(properties.goog_typing_noise_detection);
-    }
     if (!Contains(exclude_audio_properties,
                   &AudioProcessingProperties::goog_noise_suppression)) {
       EXPECT_FALSE(properties.goog_noise_suppression);
@@ -348,8 +340,6 @@ class MediaStreamConstraintsUtilAudioTestBase {
               properties.goog_auto_gain_control);
     CheckGoogExperimentalEchoCancellationDefault(
         properties, enable_webrtc_audio_processing);
-    EXPECT_EQ(enable_webrtc_audio_processing,
-              properties.goog_typing_noise_detection);
     EXPECT_EQ(enable_webrtc_audio_processing,
               properties.goog_noise_suppression);
     EXPECT_EQ(enable_webrtc_audio_processing,
@@ -383,7 +373,6 @@ class MediaStreamConstraintsUtilAudioTestBase {
               properties.echo_cancellation_type);
     EXPECT_TRUE(properties.goog_auto_gain_control);
     CheckGoogExperimentalEchoCancellationDefault(properties, true);
-    EXPECT_TRUE(properties.goog_typing_noise_detection);
     EXPECT_TRUE(properties.goog_noise_suppression);
     EXPECT_TRUE(properties.goog_experimental_noise_suppression);
     EXPECT_TRUE(properties.goog_highpass_filter);
@@ -631,7 +620,6 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, SingleBoolConstraint) {
       &AudioProcessingProperties::goog_audio_mirroring,
       &AudioProcessingProperties::goog_auto_gain_control,
       &AudioProcessingProperties::goog_experimental_echo_cancellation,
-      &AudioProcessingProperties::goog_typing_noise_detection,
       &AudioProcessingProperties::goog_noise_suppression,
       &AudioProcessingProperties::goog_experimental_noise_suppression,
       &AudioProcessingProperties::goog_highpass_filter,
@@ -644,7 +632,6 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, SingleBoolConstraint) {
           &blink::WebMediaTrackConstraintSet::goog_auto_gain_control,
           &blink::WebMediaTrackConstraintSet::
               goog_experimental_echo_cancellation,
-          &blink::WebMediaTrackConstraintSet::goog_typing_noise_detection,
           &blink::WebMediaTrackConstraintSet::goog_noise_suppression,
           &blink::WebMediaTrackConstraintSet::
               goog_experimental_noise_suppression,
@@ -1305,8 +1292,6 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, EchoCancellationWithWebRtc) {
                   properties.goog_auto_gain_control);
         CheckGoogExperimentalEchoCancellationDefault(
             properties, enable_webrtc_audio_processing);
-        EXPECT_EQ(enable_webrtc_audio_processing,
-                  properties.goog_typing_noise_detection);
         EXPECT_EQ(enable_webrtc_audio_processing,
                   properties.goog_noise_suppression);
         EXPECT_EQ(enable_webrtc_audio_processing,
@@ -1370,7 +1355,6 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, EchoCancellationWithSystem) {
                   properties.echo_cancellation_type);
         EXPECT_EQ(value, properties.goog_auto_gain_control);
         CheckGoogExperimentalEchoCancellationDefault(properties, value);
-        EXPECT_EQ(value, properties.goog_typing_noise_detection);
         EXPECT_EQ(value, properties.goog_noise_suppression);
         EXPECT_EQ(value, properties.goog_experimental_noise_suppression);
         EXPECT_EQ(value, properties.goog_highpass_filter);
@@ -1622,7 +1606,6 @@ TEST_P(MediaStreamConstraintsUtilAudioTest,
           }
           EXPECT_EQ(ec_value, properties.goog_auto_gain_control);
           CheckGoogExperimentalEchoCancellationDefault(properties, ec_value);
-          EXPECT_EQ(ec_value, properties.goog_typing_noise_detection);
           EXPECT_EQ(ec_value, properties.goog_noise_suppression);
           EXPECT_EQ(ec_value, properties.goog_experimental_noise_suppression);
           EXPECT_EQ(ec_value, properties.goog_highpass_filter);
@@ -1680,7 +1663,6 @@ TEST_P(MediaStreamConstraintsUtilAudioTest,
       &AudioProcessingProperties::goog_audio_mirroring,
       &AudioProcessingProperties::goog_auto_gain_control,
       &AudioProcessingProperties::goog_experimental_echo_cancellation,
-      &AudioProcessingProperties::goog_typing_noise_detection,
       &AudioProcessingProperties::goog_noise_suppression,
       &AudioProcessingProperties::goog_experimental_noise_suppression,
       &AudioProcessingProperties::goog_highpass_filter,
@@ -1693,7 +1675,6 @@ TEST_P(MediaStreamConstraintsUtilAudioTest,
           &blink::WebMediaTrackConstraintSet::goog_auto_gain_control,
           &blink::WebMediaTrackConstraintSet::
               goog_experimental_echo_cancellation,
-          &blink::WebMediaTrackConstraintSet::goog_typing_noise_detection,
           &blink::WebMediaTrackConstraintSet::goog_noise_suppression,
           &blink::WebMediaTrackConstraintSet::
               goog_experimental_noise_suppression,
@@ -1907,8 +1888,6 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, SourceWithAudioProcessing) {
       properties.goog_auto_gain_control = !properties.goog_auto_gain_control;
       properties.goog_experimental_echo_cancellation =
           !properties.goog_experimental_echo_cancellation;
-      properties.goog_typing_noise_detection =
-          !properties.goog_typing_noise_detection;
       properties.goog_noise_suppression = !properties.goog_noise_suppression;
       properties.goog_experimental_noise_suppression =
           !properties.goog_experimental_noise_suppression;
@@ -1928,7 +1907,6 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, SourceWithAudioProcessing) {
             &blink::WebMediaTrackConstraintSet::goog_auto_gain_control,
             &blink::WebMediaTrackConstraintSet::
                 goog_experimental_echo_cancellation,
-            &blink::WebMediaTrackConstraintSet::goog_typing_noise_detection,
             &blink::WebMediaTrackConstraintSet::goog_noise_suppression,
             &blink::WebMediaTrackConstraintSet::
                 goog_experimental_noise_suppression,
@@ -1940,7 +1918,6 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, SourceWithAudioProcessing) {
         &AudioProcessingProperties::goog_audio_mirroring,
         &AudioProcessingProperties::goog_auto_gain_control,
         &AudioProcessingProperties::goog_experimental_echo_cancellation,
-        &AudioProcessingProperties::goog_typing_noise_detection,
         &AudioProcessingProperties::goog_noise_suppression,
         &AudioProcessingProperties::goog_experimental_noise_suppression,
         &AudioProcessingProperties::goog_highpass_filter,

content/renderer/media/stream/mock_constraint_factory.cc

@@ -36,7 +36,6 @@ void MockConstraintFactory::DisableDefaultAudioConstraints() {
   basic_.goog_noise_suppression.SetExact(false);
   basic_.goog_noise_suppression.SetExact(false);
   basic_.goog_highpass_filter.SetExact(false);
-  basic_.goog_typing_noise_detection.SetExact(false);
   basic_.goog_experimental_noise_suppression.SetExact(false);
 }
 

content/renderer/media/stream/user_media_client_impl_unittest.cc

@@ -917,7 +917,6 @@ TEST_F(UserMediaClientImplTest, DefaultConstraintsPropagate) {
   EXPECT_EQ(
       blink::AudioProcessingProperties().goog_experimental_echo_cancellation,
       properties.goog_experimental_echo_cancellation);
-  EXPECT_TRUE(properties.goog_typing_noise_detection);
   EXPECT_TRUE(properties.goog_noise_suppression);
   EXPECT_TRUE(properties.goog_experimental_noise_suppression);
   EXPECT_TRUE(properties.goog_highpass_filter);
@@ -977,7 +976,6 @@ TEST_F(UserMediaClientImplTest, DefaultTabCapturePropagate) {
   EXPECT_FALSE(properties.goog_audio_mirroring);
   EXPECT_FALSE(properties.goog_auto_gain_control);
   EXPECT_FALSE(properties.goog_experimental_echo_cancellation);
-  EXPECT_FALSE(properties.goog_typing_noise_detection);
   EXPECT_FALSE(properties.goog_noise_suppression);
   EXPECT_FALSE(properties.goog_experimental_noise_suppression);
   EXPECT_FALSE(properties.goog_highpass_filter);
@@ -1035,7 +1033,6 @@ TEST_F(UserMediaClientImplTest, DefaultDesktopCapturePropagate) {
   EXPECT_FALSE(properties.goog_audio_mirroring);
   EXPECT_FALSE(properties.goog_auto_gain_control);
   EXPECT_FALSE(properties.goog_experimental_echo_cancellation);
-  EXPECT_FALSE(properties.goog_typing_noise_detection);
   EXPECT_FALSE(properties.goog_noise_suppression);
   EXPECT_FALSE(properties.goog_experimental_noise_suppression);
   EXPECT_FALSE(properties.goog_highpass_filter);
@@ -1071,7 +1068,6 @@ TEST_F(UserMediaClientImplTest, NonDefaultAudioConstraintsPropagate) {
   factory.basic().render_to_associated_sink.SetExact(true);
   factory.basic().echo_cancellation.SetExact(false);
   factory.basic().goog_audio_mirroring.SetExact(true);
-  factory.basic().goog_typing_noise_detection.SetExact(true);
   blink::WebMediaConstraints audio_constraints =
       factory.CreateWebMediaConstraints();
   // Request contains only audio
@@ -1099,7 +1095,6 @@ TEST_F(UserMediaClientImplTest, NonDefaultAudioConstraintsPropagate) {
   EXPECT_TRUE(properties.goog_audio_mirroring);
   EXPECT_FALSE(properties.goog_auto_gain_control);
   EXPECT_FALSE(properties.goog_experimental_echo_cancellation);
-  EXPECT_TRUE(properties.goog_typing_noise_detection);
   EXPECT_FALSE(properties.goog_noise_suppression);
   EXPECT_FALSE(properties.goog_experimental_noise_suppression);
   EXPECT_FALSE(properties.goog_highpass_filter);

third_party/blink/public/platform/modules/mediastream/media_stream_audio_processor_options.h

@@ -83,7 +83,7 @@ struct BLINK_PLATFORM_EXPORT AudioProcessingProperties {
 #else
       true;
 #endif
-  bool goog_typing_noise_detection = true;
+  bool goog_typing_noise_detection = false;
   bool goog_noise_suppression = true;
   bool goog_experimental_noise_suppression = true;
   bool goog_highpass_filter = true;

third_party/blink/public/platform/web_media_constraints.h

@@ -253,7 +253,6 @@ struct WebMediaTrackConstraintSet {
   BooleanConstraint goog_experimental_auto_gain_control;
   BooleanConstraint goog_noise_suppression;
   BooleanConstraint goog_highpass_filter;
-  BooleanConstraint goog_typing_noise_detection;
   BooleanConstraint goog_experimental_noise_suppression;
   BooleanConstraint goog_audio_mirroring;
   BooleanConstraint goog_da_echo_cancellation;

third_party/blink/renderer/modules/mediastream/media_constraints_impl.cc

@@ -324,8 +324,6 @@ static void ParseOldStyleNames(
           ToBoolean(constraint.value_));
     } else if (constraint.name_.Equals(kGoogHighpassFilter)) {
       result.goog_highpass_filter.SetExact(ToBoolean(constraint.value_));
-    } else if (constraint.name_.Equals(kGoogTypingNoiseDetection)) {
-      result.goog_typing_noise_detection.SetExact(ToBoolean(constraint.value_));
     } else if (constraint.name_.Equals(kGoogAudioMirroring)) {
       result.goog_audio_mirroring.SetExact(ToBoolean(constraint.value_));
     } else if (constraint.name_.Equals(kDAEchoCancellation)) {
@@ -414,7 +412,8 @@ static void ParseOldStyleNames(
                constraint.name_.Equals(kGoogBeamforming) ||
                constraint.name_.Equals(kGoogArrayGeometry) ||
                constraint.name_.Equals(kPowerLineFrequency) ||
-               constraint.name_.Equals(kMediaStreamAudioHotword)) {
+               constraint.name_.Equals(kMediaStreamAudioHotword) ||
+               constraint.name_.Equals(kGoogTypingNoiseDetection)) {
       // TODO(crbug.com/856176): Remove the kGoogBeamforming and
       // kGoogArrayGeometry special cases.
       context->AddConsoleMessage(ConsoleMessage::Create(

third_party/blink/renderer/modules/mediastream/user_media_request.cc

@@ -193,11 +193,6 @@ void CountAudioConstraintUses(ExecutionContext* context,
           constraints, &WebMediaTrackConstraintSet::goog_highpass_filter)) {
     counter.Count(WebFeature::kMediaStreamConstraintsGoogHighpassFilter);
   }
-  if (RequestUsesDiscreteConstraint(
-          constraints,
-          &WebMediaTrackConstraintSet::goog_typing_noise_detection)) {
-    counter.Count(WebFeature::kMediaStreamConstraintsGoogTypingNoiseDetection);
-  }
   if (RequestUsesDiscreteConstraint(
           constraints,
           &WebMediaTrackConstraintSet::goog_experimental_noise_suppression)) {

third_party/blink/renderer/platform/exported/web_media_constraints.cc

@@ -360,7 +360,6 @@ WebMediaTrackConstraintSet::WebMediaTrackConstraintSet()
       goog_experimental_auto_gain_control("googExperimentalAutoGainControl"),
       goog_noise_suppression("noiseSuppression"),
       goog_highpass_filter("googHighpassFilter"),
-      goog_typing_noise_detection("googTypingNoiseDetection"),
       goog_experimental_noise_suppression("googExperimentalNoiseSuppression"),
       goog_audio_mirroring("googAudioMirroring"),
       goog_da_echo_cancellation("googDAEchoCancellation"),
@@ -417,7 +416,6 @@ std::vector<const BaseConstraint*> WebMediaTrackConstraintSet::AllConstraints()
                                   &goog_experimental_auto_gain_control,
                                   &goog_noise_suppression,
                                   &goog_highpass_filter,
-                                  &goog_typing_noise_detection,
                                   &goog_experimental_noise_suppression,
                                   &goog_audio_mirroring,
                                   &goog_da_echo_cancellation,