Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: content/renderer/media/media_stream_video_source.h

Issue 129923002: Implements MediaStreamVideoSource. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..c84632ab57aa82d0ee0d6ecbbc6aa9391e9dbdbf 100644
--- a/content/renderer/media/media_stream_video_source.h
+++ b/content/renderer/media/media_stream_video_source.h
@@ -19,6 +19,8 @@ class VideoFrame;
namespace content {
+class MediaStreamDependencyFactory;
+
// MediaStreamVideoSource is an interface used for sending video frames to a
// MediaStreamVideoTrack.
// http://dev.w3.org/2011/webrtc/editor/getusermedia.html
@@ -26,14 +28,25 @@ namespace content {
class CONTENT_EXPORT MediaStreamVideoSource
: public MediaStreamSourceExtraData {
public:
+
perkj_chrome 2014/01/14 08:29:10 remove empty line
Ronghua Wu (Left Chromium) 2014/01/14 19:42:10 Done.
+ MediaStreamVideoSource(
+ MediaStreamDependencyFactory* factory,
+ webrtc::VideoSourceInterface* adapter);
perkj_chrome 2014/01/14 08:29:10 If you look at my cl you will see that I can not c
+
// 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);
+ virtual bool AddTrack(const blink::WebMediaStreamTrack& track,
perkj_chrome 2014/01/14 08:29:10 Please keep void for now.
Ronghua Wu (Left Chromium) 2014/01/14 19:42:10 Done.
+ const blink::WebMediaConstraints& constraints);
// Removes |track| from the registered tracks list, i.e. will stop delivering
// frame to |track|.
- void RemoveTrack(const blink::WebMediaStreamTrack& track);
+ virtual bool RemoveTrack(const blink::WebMediaStreamTrack& track);
+
+ // TODO(ronghuawu): Remove webrtc::VideoSourceInterface from the public
+ // interface of this class.
+ webrtc::VideoSourceInterface* GetAdapter() {
+ return adapter_;
+ }
protected:
// Sets ready state and notifies the ready state to all registered tracks.
@@ -43,6 +56,13 @@ class CONTENT_EXPORT MediaStreamVideoSource
virtual void DeliverVideoFrame(const scoped_refptr<media::VideoFrame>& frame);
virtual ~MediaStreamVideoSource();
+
+ private:
+ MediaStreamDependencyFactory* factory_;
+ scoped_refptr<webrtc::VideoSourceInterface> adapter_;
+ int width_;
+ int height_;
+ base::TimeDelta first_frame_timestamp_;
};
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698