Reland "SelectSettings algorithm for audio constraints."

content/renderer/media/media_stream_audio_processor_options.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_
 
 #include <string>
+#include <vector>
 
 #include "base/files/file.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 #include "content/public/common/media_stream_request.h"
+#include "media/base/audio_point.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/webrtc/api/mediastreaminterface.h"
 #include "third_party/webrtc/media/base/mediachannel.h"
 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h"
 
 namespace webrtc {
 
 class EchoCancellation;
 class TypingDetection;
 
 }
 
 namespace content {
 
 using webrtc::AudioProcessing;
 
 // A helper class to parse audio constraints from a blink::WebMediaConstraints
 // object.
+// TODO(guidou): Remove this class. http://crbug.com/706408
 class CONTENT_EXPORT MediaAudioConstraints {
  public:
   // Constraint keys used by audio processing.
   static const char kEchoCancellation[];
   static const char kGoogEchoCancellation[];
   static const char kGoogExperimentalEchoCancellation[];
   static const char kGoogAutoGainControl[];
   static const char kGoogExperimentalAutoGainControl[];
   static const char kGoogNoiseSuppression[];
   static const char kGoogExperimentalNoiseSuppression[];
@@ skipping 44 matching lines @@
   }
 
  private:
   // Gets the default value of constraint named by |key| in |constraints|.
   bool GetDefaultValueForConstraint(const std::string& key) const;
   const blink::WebMediaConstraints constraints_;
   const int effects_;
   bool default_audio_processing_constraint_value_;
 };
 
+// Simple struct with audio-processing properties. Will substitute
+// MediaAudioConstraints once the old constraints-processing algorithm is
+// removed. http://crbug.com/706408
+struct CONTENT_EXPORT AudioProcessingProperties {
+  // Creates an AudioProcessingProperties object with fields initialized to
+  // their default values.
+  AudioProcessingProperties();
+  AudioProcessingProperties(const AudioProcessingProperties& other);
+  AudioProcessingProperties& operator=(const AudioProcessingProperties& other);
+  AudioProcessingProperties(AudioProcessingProperties&& other);
+  AudioProcessingProperties& operator=(AudioProcessingProperties&& other);
+  ~AudioProcessingProperties();
+
+  bool enable_sw_echo_cancellation = true;
+  bool disable_hw_echo_cancellation = false;
+  bool goog_audio_mirroring = false;
+  bool goog_auto_gain_control = true;
+  bool goog_experimental_echo_cancellation =
+#if defined(OS_ANDROID)
+      false;
+#else
+      true;
+#endif
+  bool goog_typing_noise_detection = true;
+  bool goog_noise_suppression = true;
+  bool goog_experimental_noise_suppression = true;
+  bool goog_beamforming = true;
+  bool goog_highpass_filter = true;
+  bool goog_experimental_auto_gain_control = true;
+  std::vector<media::Point> goog_array_geometry;
+};
+
 // A helper class to log echo information in general and Echo Cancellation
 // quality in particular.
 class CONTENT_EXPORT EchoInformation {
  public:
   EchoInformation();
   virtual ~EchoInformation();
 
   // Updates stats, and reports delay metrics as UMA stats every 5 seconds.
   // Must be called every time AudioProcessing::ProcessStream() is called.
   void UpdateAecStats(webrtc::EchoCancellation* echo_cancellation);
@@ skipping 55 matching lines @@
 
 // Returns the array geometry from the media constraints if existing and
 // otherwise that provided by the input device.
 CONTENT_EXPORT std::vector<webrtc::Point> GetArrayGeometryPreferringConstraints(
     const MediaAudioConstraints& audio_constraints,
     const MediaStreamDevice::AudioDeviceParameters& input_params);
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_