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

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

Issue 231963002: Revert 262050 "Implement a source for remote video tracks." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
12 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.h"
13 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
14 #include "content/public/renderer/media_stream_video_sink.h" 14 #include "content/public/renderer/media_stream_video_sink.h"
15 #include "content/renderer/media/media_stream_track.h" 15 #include "content/renderer/media/media_stream_track.h"
16 #include "content/renderer/media/media_stream_video_source.h" 16 #include "content/renderer/media/media_stream_video_source.h"
17 17
18 namespace webrtc { 18 namespace webrtc {
19 class VideoTrackInterface; 19 class VideoTrackInterface;
20 } 20 }
21 21
22 namespace content { 22 namespace content {
23 23
24 class MediaStreamDependencyFactory; 24 class MediaStreamDependencyFactory;
25 class WebRtcVideoSinkAdapter;
25 26
26 // MediaStreamVideoTrack is a video specific representation of a 27 // MediaStreamVideoTrack is a video specific representation of a
27 // blink::WebMediaStreamTrack in content. It is owned by the blink object 28 // blink::WebMediaStreamTrack in content. It is owned by the blink object
28 // and can be retrieved from a blink object using 29 // and can be retrieved from a blink object using
29 // WebMediaStreamTrack::extraData() or MediaStreamVideoTrack::GetVideoTrack. 30 // WebMediaStreamTrack::extraData() or MediaStreamVideoTrack::GetVideoTrack.
30 class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack { 31 class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
31 public: 32 public:
32 // Help method to create a blink::WebMediaStreamTrack and a 33 // Help method to create a blink::WebMediaStreamTrack and a
33 // MediaStreamVideoTrack instance. The MediaStreamVideoTrack object is owned 34 // MediaStreamVideoTrack instance. The MediaStreamVideoTrack object is owned
34 // by the blink object in its WebMediaStreamTrack::ExtraData member. 35 // by the blink object in its WebMediaStreamTrack::ExtraData member.
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 // track. 80 // track.
80 MediaStreamVideoSource* source_; 81 MediaStreamVideoSource* source_;
81 82
82 // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread. 83 // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread.
83 // It's valid for the lifetime of RenderThread. 84 // It's valid for the lifetime of RenderThread.
84 MediaStreamDependencyFactory* factory_; 85 MediaStreamDependencyFactory* factory_;
85 86
86 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrack); 87 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrack);
87 }; 88 };
88 89
90 // WebRtcMediaStreamVideoTrack is a content representation of a video track.
91 // received on a PeerConnection.
92 // TODO(perkj): Replace WebRtcMediaStreamVideoTrack with a remote
93 // MediaStreamVideoSource class so that all tracks are MediaStreamVideoTracks
94 // and new tracks can be cloned from the original remote video track.
95 // crbug/334243.
96 class CONTENT_EXPORT WebRtcMediaStreamVideoTrack
97 : public MediaStreamVideoTrack {
98 public:
99 explicit WebRtcMediaStreamVideoTrack(webrtc::VideoTrackInterface* track);
100 virtual ~WebRtcMediaStreamVideoTrack();
101 virtual void AddSink(MediaStreamVideoSink* sink) OVERRIDE;
102 virtual void RemoveSink(MediaStreamVideoSink* sink) OVERRIDE;
103
104 private:
105 ScopedVector<WebRtcVideoSinkAdapter> sinks_;
106
107 DISALLOW_COPY_AND_ASSIGN(WebRtcMediaStreamVideoTrack);
108 };
109
89 } // namespace content 110 } // namespace content
90 111
91 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_ 112 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698