| Index: content/renderer/media/media_stream_dependency_factory.h
|
| diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/media_stream_dependency_factory.h
|
| index 0a0b120c376f62da4b43cfa21bcb7e468d849b72..2a4eb41a943e7697ec87915859a1582e49aa6f4d 100644
|
| --- a/content/renderer/media/media_stream_dependency_factory.h
|
| +++ b/content/renderer/media/media_stream_dependency_factory.h
|
| @@ -74,19 +74,19 @@ class CONTENT_EXPORT MediaStreamDependencyFactory
|
| blink::WebRTCPeerConnectionHandler* CreateRTCPeerConnectionHandler(
|
| blink::WebRTCPeerConnectionHandlerClient* client);
|
|
|
| - // CreateNativeMediaSources creates libjingle representations of
|
| - // the underlying sources to the tracks in |web_stream|.
|
| - // |sources_created| is invoked when the sources have either been created and
|
| - // transitioned to a live state or failed.
|
| - // The libjingle sources is stored in the extra data field of
|
| + // InitializeMediaStreamAudioSource initialize a MediaStream source object
|
| + // for audio input.
|
| + // The sources are stored in the extra data field of
|
| // WebMediaStreamSource.
|
| - // |audio_constraints| and |video_constraints| set parameters for the sources.
|
| - void CreateNativeMediaSources(
|
| + bool InitializeMediaStreamAudioSource(
|
| int render_view_id,
|
| const blink::WebMediaConstraints& audio_constraints,
|
| - const blink::WebMediaConstraints& video_constraints,
|
| - blink::WebMediaStream* web_stream,
|
| - const MediaSourcesCreatedCallback& sources_created);
|
| + const blink::WebVector<blink::WebMediaStreamSource>& audio_sources);
|
| +
|
| + // Creates an implementation of a cricket::VideoCapturer object that can be
|
| + // used when creating a libjingle webrtc::VideoSourceInterface object.
|
| + virtual cricket::VideoCapturer* CreateVideoCapturer(
|
| + const StreamDeviceInfo& info);
|
|
|
| // Creates a libjingle representation of a MediaStream and stores
|
| // it in the extra data field of |web_stream|.
|
| @@ -176,13 +176,6 @@ class CONTENT_EXPORT MediaStreamDependencyFactory
|
| CreateLocalAudioSource(
|
| const webrtc::MediaConstraintsInterface* constraints);
|
|
|
| - // Asks the PeerConnection factory to create a Local Video Source.
|
| - virtual scoped_refptr<webrtc::VideoSourceInterface>
|
| - CreateLocalVideoSource(
|
| - int video_session_id,
|
| - bool is_screen_cast,
|
| - 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
|
|
|