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

Side by Side Diff: content/renderer/media/media_stream_video_track.h

Issue 155853002: Chrome MediaStream VideoTrack implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More cleanup. Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_
7 7
8 #include <vector>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
10 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.h"
11 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
12 #include "content/public/renderer/media_stream_video_sink.h" 14 #include "content/public/renderer/media_stream_video_sink.h"
13 #include "content/renderer/media/media_stream_track.h" 15 #include "content/renderer/media/media_stream_track.h"
14 16
15 namespace webrtc { 17 namespace webrtc {
16 class VideoTrackInterface; 18 class VideoTrackInterface;
17 } 19 }
18 20
19 namespace content { 21 namespace content {
20 22
21 class MediaStreamDependencyFactory; 23 class MediaStreamDependencyFactory;
24 class MediaStreamVideoSource;
22 class WebRtcVideoSinkAdapter; 25 class WebRtcVideoSinkAdapter;
23 26
24 // MediaStreamVideoTrack is a video specific representation of a 27 // MediaStreamVideoTrack is a video specific representation of a
25 // blink::WebMediaStreamTrack in content. It is owned by the blink object 28 // blink::WebMediaStreamTrack in content. It is owned by the blink object
26 // and can be retrieved from a blink object using 29 // and can be retrieved from a blink object using
27 // WebMediaStreamTrack::extraData() 30 // WebMediaStreamTrack::extraData()
28 class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack { 31 class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
29 public: 32 public:
33 static MediaStreamVideoTrack* GetVideoTrack(
34 const blink::WebMediaStreamTrack& track);
35
30 // Constructor for local video tracks. 36 // Constructor for local video tracks.
31 explicit MediaStreamVideoTrack(MediaStreamDependencyFactory* factory); 37 MediaStreamVideoTrack(MediaStreamVideoSource* source,
32 // Constructor for remote video tracks. 38 MediaStreamDependencyFactory* factory);
33 explicit MediaStreamVideoTrack(webrtc::VideoTrackInterface* track); 39
34 virtual ~MediaStreamVideoTrack(); 40 virtual ~MediaStreamVideoTrack();
35 void AddSink(MediaStreamVideoSink* sink); 41 virtual void AddSink(MediaStreamVideoSink* sink);
36 void RemoveSink(MediaStreamVideoSink* sink); 42 virtual void RemoveSink(MediaStreamVideoSink* sink);
37 43
38 virtual webrtc::VideoTrackInterface* GetVideoAdapter() OVERRIDE; 44 virtual webrtc::VideoTrackInterface* GetVideoAdapter() OVERRIDE;
45 virtual void SetEnabled(bool enabled) OVERRIDE;
46
47 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame);
48 void OnReadyStateChanged(blink::WebMediaStreamSource::ReadyState state);
49
50 protected:
51 // Used to DCHECK that we are called on the correct thread.
52 base::ThreadChecker thread_checker_;
39 53
40 private: 54 private:
41 // Used to DCHECK that we are called on the correct thread. 55 bool enabled_;
42 base::ThreadChecker thread_checker_; 56 std::vector<MediaStreamVideoSink*> sinks_;
43 ScopedVector<WebRtcVideoSinkAdapter> sinks_; 57
58 // Weak ref to the source this tracks is connected to. |source_| is owned
59 // by the blink::WebMediaStreamSource and is guaranteed to outlive the
60 // track.
61 MediaStreamVideoSource* source_;
44 62
45 // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread. 63 // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread.
46 // It's valid for the lifetime of RenderThread. 64 // It's valid for the lifetime of RenderThread.
47 MediaStreamDependencyFactory* factory_; 65 MediaStreamDependencyFactory* factory_;
48 66
49 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrack); 67 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrack);
50 }; 68 };
51 69
70 // TODO(perkj): Replace RemoteMediaStreamVideoTrack with a remote video source
Jói 2014/02/28 14:52:50 RemoteVideoStreamTrack -> WebRtcMediaStreamVideoTr
perkj_chrome 2014/03/02 09:20:44 Done.
71 // delegate.
72 class CONTENT_EXPORT WebRtcMediaStreamVideoTrack
Ronghua Wu (Left Chromium) 2014/03/01 01:26:04 comments for this class.
perkj_chrome 2014/03/02 09:20:44 Done.
73 : public MediaStreamVideoTrack {
74 public:
75 explicit WebRtcMediaStreamVideoTrack(webrtc::VideoTrackInterface* track);
76 virtual ~WebRtcMediaStreamVideoTrack();
77 virtual void AddSink(MediaStreamVideoSink* sink) OVERRIDE;
78 virtual void RemoveSink(MediaStreamVideoSink* sink) OVERRIDE;
79
80 private:
81 ScopedVector<WebRtcVideoSinkAdapter> sinks_;
82
83 DISALLOW_COPY_AND_ASSIGN(WebRtcMediaStreamVideoTrack);
84 };
85
52 } // namespace content 86 } // namespace content
53 87
54 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_ 88 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698