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 73d705dcc2ad78e378328d64157cc62b9c909b88..fa799b7d762c0916dd41094905127a9984e1278b 100644 |
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.h |
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h |
@@ -47,11 +47,7 @@ namespace content { |
class IpcNetworkManager; |
class IpcPacketSocketFactory; |
-class MediaStreamAudioSource; |
-class WebAudioCapturerSource; |
-class WebRtcAudioCapturer; |
class WebRtcAudioDeviceImpl; |
-class WebRtcLocalAudioTrack; |
class WebRtcLoggingHandlerImpl; |
class WebRtcLoggingMessageFilter; |
class WebRtcVideoCapturerAdapter; |
@@ -75,26 +71,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::VideoTrackSourceInterface 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, |
@@ -139,18 +120,12 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory |
scoped_refptr<base::SingleThreadTaskRunner> GetWebRtcWorkerThread() const; |
scoped_refptr<base::SingleThreadTaskRunner> GetWebRtcSignalingThread() const; |
- protected: |
- // Asks the PeerConnection factory to create a Local Audio Source. |
+ // Called by ProcessedLocalAudioSource to have the PeerConnection factory |
+ // create the corresponding WebRtc-internal instance. |
virtual scoped_refptr<webrtc::AudioSourceInterface> CreateLocalAudioSource( |
const cricket::AudioOptions& options); |
- // 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. Ownership of the new WebAudioCapturerSource is |
- // transferred to |source|. |
- virtual void CreateWebAudioSource(blink::WebMediaStreamSource* source); |
- |
+ protected: |
// Asks the PeerConnection factory to create a Local VideoTrack object with |
// the video source using |capturer|. |
virtual scoped_refptr<webrtc::VideoTrackInterface> |
@@ -161,15 +136,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_ptr<WebRtcAudioCapturer> CreateAudioCapturer( |
- int render_frame_id, |
- const StreamDeviceInfo& device_info, |
- const blink::WebMediaConstraints& constraints, |
- MediaStreamAudioSource* audio_source); |
- |
private: |
// Implement base::MessageLoop::DestructionObserver. |
// This makes sure the libjingle PeerConnectionFactory is released before |