X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Frenderer%2Fmedia%2Fmedia_stream_dependency_factory.h;h=6da8364caac74560ace21ae24e80fef66e9d44a0;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=13bfa3f032f346b71f53b34fa20767f634ba5e92;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/content/renderer/media/media_stream_dependency_factory.h b/src/content/renderer/media/media_stream_dependency_factory.h
index 13bfa3f..6da8364 100644
--- a/src/content/renderer/media/media_stream_dependency_factory.h
+++ b/src/content/renderer/media/media_stream_dependency_factory.h
@@ -45,6 +45,7 @@ namespace content {
 
 class IpcNetworkManager;
 class IpcPacketSocketFactory;
+class MediaStreamAudioSource;
 class RTCMediaConstraints;
 class WebAudioCapturerSource;
 class WebRtcAudioCapturer;
@@ -70,19 +71,17 @@ 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
-  // WebMediaStreamSource.
-  // |audio_constraints| and |video_constraints| set parameters for the sources.
-  void CreateNativeMediaSources(
+  // InitializeMediaStreamAudioSource initialize a MediaStream source object
+  // for audio input.
+  bool InitializeMediaStreamAudioSource(
       int render_view_id,
       const blink::WebMediaConstraints& audio_constraints,
-      const blink::WebMediaConstraints& video_constraints,
-      blink::WebMediaStream* web_stream,
-      const MediaSourcesCreatedCallback& sources_created);
+      MediaStreamAudioSource* source_data);
+
+  // 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|.
@@ -168,27 +167,17 @@ 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
   // WebRtcAudioCapturer.
-  // The |constraints| will be modified to include the default, mandatory
-  // WebAudio constraints.
   virtual scoped_refptr<WebAudioCapturerSource> CreateWebAudioSource(
-      blink::WebMediaStreamSource* source,
-      const RTCMediaConstraints& constraints);
+      blink::WebMediaStreamSource* source);
 
   // Asks the PeerConnection factory to create a Local AudioTrack object.
   virtual scoped_refptr<webrtc::AudioTrackInterface>
       CreateLocalAudioTrack(
-          const std::string& id,
+          const blink::WebMediaStreamTrack& blink_track,
           const scoped_refptr<WebRtcAudioCapturer>& capturer,
           WebAudioCapturerSource* webaudio_source,
           webrtc::AudioSourceInterface* source);
@@ -204,7 +193,8 @@ class CONTENT_EXPORT MediaStreamDependencyFactory
       CreateLocalVideoTrack(const std::string& id,
                             cricket::VideoCapturer* capturer);
 
-  virtual bool EnsurePeerConnectionFactory();
+  virtual const scoped_refptr<webrtc::PeerConnectionFactoryInterface>&
+      GetPcFactory();
   virtual bool PeerConnectionFactoryCreated();
 
   // Returns a new capturer or existing capturer based on the |render_view_id|
@@ -215,9 +205,9 @@ class CONTENT_EXPORT MediaStreamDependencyFactory
       const blink::WebMediaConstraints& constraints);
 
  private:
-  // Creates and deletes |pc_factory_|, which in turn is used for
+  // Creates |pc_factory_|, which in turn is used for
   // creating PeerConnection objects.
-  bool CreatePeerConnectionFactory();
+  void CreatePeerConnectionFactory();
 
   void InitializeWorkerThread(talk_base::Thread** thread,
                               base::WaitableEvent* event);
@@ -240,6 +230,9 @@ class CONTENT_EXPORT MediaStreamDependencyFactory
 
   void StartAecDump(const base::PlatformFile& aec_dump_file);
 
+  // Helper method to create a WebRtcAudioDeviceImpl.
+  void EnsureWebRtcAudioDeviceImpl();
+
   // We own network_manager_, must be deleted on the worker thread.
   // The network manager uses |p2p_socket_dispatcher_|.
   IpcNetworkManager* network_manager_;