Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource

content/renderer/media/media_stream_video_source.h

Index: content/renderer/media/media_stream_video_source.h
diff --git a/content/renderer/media/media_stream_video_source.h b/content/renderer/media/media_stream_video_source.h
index 2130916b1b9c296813fbb94b9234241a8e916385..140ce8c1dcc273a1fa1895548de0631eaa3fb5f6 100644
--- a/content/renderer/media/media_stream_video_source.h
+++ b/content/renderer/media/media_stream_video_source.h
@@ -6,9 +6,9 @@
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
 
 #include "base/compiler_specific.h"
-#include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
-#include "content/renderer/media/media_stream_source_extra_data.h"
+#include "content/renderer/media/media_stream_dependency_factory.h"
+#include "content/renderer/media/media_stream_source.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
@@ -24,25 +24,34 @@ namespace content {
 // http://dev.w3.org/2011/webrtc/editor/getusermedia.html
 // All methods calls will be done from the main render thread.
 class CONTENT_EXPORT MediaStreamVideoSource
-    : public MediaStreamSourceExtraData {
+    : public MediaStreamSource {

[Alpha Left Google, 2014/01/15 01:57:47]

Just trying to understand a few more items.

Do you plan to have a spearate implementation of MediaStreamVideoSource for
video capture device and webrtc sources?

If so maybe it is better to make an abstract class? 

[perkj_chrome, 2014/01/16 15:48:08]

My plan was to use MediaStreamSource as a base.
Currently we have identified that we need one implementation for sources created
by getusermedia, one for the new NaCl plugin that can create a source by it self
and 1 for remote video tracks that acts as the bridge between incoming libjingle
video tracks and chromes video tracks. 

  public:
-  // Puts |track| in the registered tracks list. Will later
-  // deliver frames to it according to |constraints|.
-  void AddTrack(const blink::WebMediaStreamTrack& track,
-                const blink::WebMediaConstraints& constraints);
+  explicit MediaStreamVideoSource(MediaStreamDependencyFactory* factory);
 
-  // Removes |track| from the registered tracks list, i.e. will stop delivering
-  // frame to |track|.
-  void RemoveTrack(const blink::WebMediaStreamTrack& track);
+  // Puts |track| in the registered tracks list.
+  virtual void AddTrack(const blink::WebMediaStreamTrack& track) OVERRIDE;
+  virtual void RemoveTrack(const blink::WebMediaStreamTrack& track) OVERRIDE;
 
+  webrtc::VideoSourceInterface* GetAdapter() {
+    return adapter_;
+  }
  protected:
+  virtual void DoStopSource() OVERRIDE {}
+  void SetAdapter(
+      const scoped_refptr<webrtc::VideoSourceInterface>& adapter);
+
+  MediaStreamDependencyFactory* factory() { return factory_; }
+
   // Sets ready state and notifies the ready state to all registered tracks.
   virtual void SetReadyState(blink::WebMediaStreamSource::ReadyState state);
 
   // Delivers |frame| to registered tracks according to their constraints.
   virtual void DeliverVideoFrame(const scoped_refptr<media::VideoFrame>& frame);
-
   virtual ~MediaStreamVideoSource();
+
+ private:
+  scoped_refptr<webrtc::VideoSourceInterface> adapter_;
+  MediaStreamDependencyFactory* factory_;
 };
 
 }  // namespace content