Enable new getUserMedia audio constraints algorithm behind a flag.

content/renderer/media/media_stream_audio_processor.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_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_H_
 
+#include <memory>
+
 #include "base/atomicops.h"
 #include "base/files/file.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/optional.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/renderer/media/aec_dump_message_filter.h"
 #include "content/renderer/media/audio_repetition_detector.h"
+#include "content/renderer/media/media_stream_audio_processor_options.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 #include "media/base/audio_converter.h"
 #include "third_party/webrtc/api/mediastreaminterface.h"
 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h"
 
 // The audio repetition detector is by default only used on non-official
 // ChromeOS builds for debugging purposes. http://crbug.com/658719.
 #if !defined(ENABLE_AUDIO_REPETITION_DETECTOR)
 #if defined(OS_CHROMEOS) && !defined(OFFICIAL_BUILD)
 #define ENABLE_AUDIO_REPETITION_DETECTOR 1
 #else
 #define ENABLE_AUDIO_REPETITION_DETECTOR 0
 #endif
 #endif
 
-namespace blink {
-class WebMediaConstraints;
-}
-
 namespace media {
 class AudioBus;
 class AudioParameters;
 }  // namespace media
 
 namespace webrtc {
 class TypingDetection;
 }
 
 namespace content {
@@ skipping 12 matching lines @@
     NON_EXPORTED_BASE(public WebRtcPlayoutDataSource::Sink),
     NON_EXPORTED_BASE(public AudioProcessorInterface),
     NON_EXPORTED_BASE(public AecDumpMessageFilter::AecDumpDelegate) {
  public:
   // |playout_data_source| is used to register this class as a sink to the
   // WebRtc playout data for processing AEC. If clients do not enable AEC,
   // |playout_data_source| won't be used.
   //
   // Threading note: The constructor assumes it is being run on the main render
   // thread.
-  MediaStreamAudioProcessor(
-      const blink::WebMediaConstraints& constraints,
-      const MediaStreamDevice::AudioDeviceParameters& input_params,
-      WebRtcPlayoutDataSource* playout_data_source);
+  MediaStreamAudioProcessor(const AudioProcessingProperties& properties,
+                            WebRtcPlayoutDataSource* playout_data_source);
 
   // Called when the format of the capture data has changed.
   // Called on the main render thread. The caller is responsible for stopping
   // the capture thread before calling this method.
   // After this method, the capture thread will be changed to a new capture
   // thread.
   void OnCaptureFormatChanged(const media::AudioParameters& source_params);
 
   // Pushes capture data in |audio_source| to the internal FIFO. Each call to
   // this method should be followed by calls to ProcessAndConsumeData() while
@@ skipping 32 matching lines @@
   bool has_audio_processing() const { return audio_processing_ != NULL; }
 
   // AecDumpMessageFilter::AecDumpDelegate implementation.
   // Called on the main render thread.
   void OnAecDumpFile(const IPC::PlatformFileForTransit& file_handle) override;
   void OnDisableAecDump() override;
   void OnAec3Enable(bool enable) override;
   void OnIpcClosing() override;
 
   // Returns true if MediaStreamAudioProcessor would modify the audio signal,
-  // based on the |constraints| and |effects_flags| parsed from a user media
-  // request. If the audio signal would not be modified, there is no need to
-  // instantiate a MediaStreamAudioProcessor and feed audio through it. Doing so
-  // would waste a non-trivial amount of memory and CPU resources.
-  //
-  // See media::AudioParameters::PlatformEffectsMask for interpretation of
-  // |effects_flags|.
-  static bool WouldModifyAudio(const blink::WebMediaConstraints& constraints,
-                               int effects_flags);
+  // based on |properties|. If the audio signal would not be modified, there is
+  // no need to instantiate a MediaStreamAudioProcessor and feed audio through
+  // it. Doing so would waste a non-trivial amount of memory and CPU resources.
+  static bool WouldModifyAudio(const AudioProcessingProperties& properties);
 
  protected:
   ~MediaStreamAudioProcessor() override;
 
  private:
   friend class MediaStreamAudioProcessorTest;
 
   FRIEND_TEST_ALL_PREFIXES(MediaStreamAudioProcessorTest,
                            GetAecDumpMessageFilter);
 
   // WebRtcPlayoutDataSource::Sink implementation.
   void OnPlayoutData(media::AudioBus* audio_bus,
                      int sample_rate,
                      int audio_delay_milliseconds) override;
   void OnPlayoutDataSourceChanged() override;
   void OnRenderThreadChanged() override;
 
   // webrtc::AudioProcessorInterface implementation.
   // This method is called on the libjingle thread.
   void GetStats(AudioProcessorStats* stats) override;
 
   // Helper to initialize the WebRtc AudioProcessing.
   void InitializeAudioProcessingModule(
-      const blink::WebMediaConstraints& constraints,
-      const MediaStreamDevice::AudioDeviceParameters& input_params);
+      const AudioProcessingProperties& properties);
 
   // Helper to initialize the capture converter.
   void InitializeCaptureFifo(const media::AudioParameters& input_format);
 
   // Helper to initialize the render converter.
   void InitializeRenderFifoIfNeeded(int sample_rate,
                                     int number_of_channels,
                                     int frames_per_buffer);
 
   // Called by ProcessAndConsumeData().
@@ skipping 73 matching lines @@
   // Object for logging UMA stats for echo information when the AEC is enabled.
   // Accessed on the main render thread.
   std::unique_ptr<EchoInformation> echo_information_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioProcessor);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_H_