MediaStream audio sourcing: Bypass audio processing for non-WebRTC cases.

content/renderer/media/webrtc/peer_connection_dependency_factory.h

Index: content/renderer/media/webrtc/peer_connection_dependency_factory.h
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.h b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
index 212eefb20d2ed70cfc54ba1c040b5242b5405b23..5869e34fd529428042c445a7d7870a8e1ac21edb 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.h
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
@@ -48,12 +48,9 @@ namespace content {
 
 class IpcNetworkManager;
 class IpcPacketSocketFactory;
-class MediaStreamAudioSource;
+class ProcessedLocalAudioSource;
 class RTCMediaConstraints;
-class WebAudioCapturerSource;
-class WebRtcAudioCapturer;
 class WebRtcAudioDeviceImpl;
-class WebRtcLocalAudioTrack;
 class WebRtcLoggingHandlerImpl;
 class WebRtcLoggingMessageFilter;
 class WebRtcVideoCapturerAdapter;
@@ -77,26 +74,11 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
   virtual scoped_refptr<webrtc::MediaStreamInterface>
       CreateLocalMediaStream(const std::string& label);
 
-  // InitializeMediaStreamAudioSource initialize a MediaStream source object
-  // for audio input.
-  bool InitializeMediaStreamAudioSource(
-      int render_frame_id,
-      const blink::WebMediaConstraints& audio_constraints,
-      MediaStreamAudioSource* source_data);
-
   // Creates an implementation of a cricket::VideoCapturer object that can be
   // used when creating a libjingle webrtc::VideoSourceInterface object.
   virtual WebRtcVideoCapturerAdapter* CreateVideoCapturer(
       bool is_screen_capture);
 
-  // Creates an instance of WebRtcLocalAudioTrack and stores it
-  // in the extraData field of |track|.
-  void CreateLocalAudioTrack(const blink::WebMediaStreamTrack& track);
-
-  // Creates an instance of MediaStreamRemoteAudioTrack and associates with the
-  // |track| object.
-  void CreateRemoteAudioTrack(const blink::WebMediaStreamTrack& track);
-
   // Asks the PeerConnection factory to create a Local VideoTrack object.
   virtual scoped_refptr<webrtc::VideoTrackInterface>
       CreateLocalVideoTrack(const std::string& id,
@@ -144,18 +126,13 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
   scoped_refptr<base::SingleThreadTaskRunner> GetWebRtcSignalingThread() const;
 
  protected:
+  friend class ProcessedLocalAudioSource;
+
   // Asks the PeerConnection factory to create a Local Audio Source.
   virtual scoped_refptr<webrtc::AudioSourceInterface>
       CreateLocalAudioSource(
           const webrtc::MediaConstraintsInterface* constraints);
 
-  // Creates a media::AudioCapturerSource with an implementation that is
-  // specific for a WebAudio source. The created WebAudioCapturerSource
-  // instance will function as audio source instead of the default
-  // WebRtcAudioCapturer.
-  virtual scoped_refptr<WebAudioCapturerSource> CreateWebAudioSource(
-      blink::WebMediaStreamSource* source);
-
   // Asks the PeerConnection factory to create a Local VideoTrack object with
   // the video source using |capturer|.
   virtual scoped_refptr<webrtc::VideoTrackInterface>
@@ -166,20 +143,6 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
       GetPcFactory();
   virtual bool PeerConnectionFactoryCreated();
 
-  // Returns a new capturer or existing capturer based on the |render_frame_id|
-  // and |device_info|; if both are valid, it reuses existing capture if any --
-  // otherwise it creates a new capturer.
-  virtual scoped_refptr<WebRtcAudioCapturer> CreateAudioCapturer(
-      int render_frame_id,
-      const StreamDeviceInfo& device_info,
-      const blink::WebMediaConstraints& constraints,
-      MediaStreamAudioSource* audio_source);
-
-  // Adds the audio device as a sink to the audio track and starts the local
-  // audio track. This is virtual for test purposes since no real audio device
-  // exist in unit tests.
-  virtual void StartLocalAudioTrack(WebRtcLocalAudioTrack* audio_track);
-
  private:
   // Implement base::MessageLoop::DestructionObserver.
   // This makes sure the libjingle PeerConnectionFactory is released before