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

Side by Side Diff: webrtc/api/videotrack.cc

Issue 1684423002: Make VideoTrack and VideoTrackRenderers implement rtc::VideoSourceInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Delete unused last_frame method and corresponding member. Created 4 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 15 matching lines...) Expand all
26 26
27 VideoTrack::~VideoTrack() { 27 VideoTrack::~VideoTrack() {
28 if (video_source_) 28 if (video_source_)
29 video_source_->RemoveSink(&renderers_); 29 video_source_->RemoveSink(&renderers_);
30 } 30 }
31 31
32 std::string VideoTrack::kind() const { 32 std::string VideoTrack::kind() const {
33 return kVideoKind; 33 return kVideoKind;
34 } 34 }
35 35
36 void VideoTrack::AddRenderer(VideoRendererInterface* renderer) { 36 void VideoTrack::AddOrUpdateSink(
37 renderers_.AddRenderer(renderer); 37 rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
38 const rtc::VideoSinkWants& wants) {
39 renderers_.AddOrUpdateSink(sink, wants);
38 } 40 }
39 41
40 void VideoTrack::RemoveRenderer(VideoRendererInterface* renderer) { 42 void VideoTrack::RemoveSink(
41 renderers_.RemoveRenderer(renderer); 43 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
44 renderers_.RemoveSink(sink);
42 } 45 }
43 46
44 rtc::VideoSinkInterface<cricket::VideoFrame>* VideoTrack::GetSink() { 47 rtc::VideoSinkInterface<cricket::VideoFrame>* VideoTrack::GetSink() {
45 return &renderers_; 48 return &renderers_;
46 } 49 }
47 50
48 bool VideoTrack::set_enabled(bool enable) { 51 bool VideoTrack::set_enabled(bool enable) {
49 renderers_.SetEnabled(enable); 52 renderers_.SetEnabled(enable);
50 return MediaStreamTrack<VideoTrackInterface>::set_enabled(enable); 53 return MediaStreamTrack<VideoTrackInterface>::set_enabled(enable);
51 } 54 }
52 55
53 rtc::scoped_refptr<VideoTrack> VideoTrack::Create( 56 rtc::scoped_refptr<VideoTrack> VideoTrack::Create(
54 const std::string& id, VideoSourceInterface* source) { 57 const std::string& id,
58 VideoSourceInterface* source) {
55 rtc::RefCountedObject<VideoTrack>* track = 59 rtc::RefCountedObject<VideoTrack>* track =
56 new rtc::RefCountedObject<VideoTrack>(id, source); 60 new rtc::RefCountedObject<VideoTrack>(id, source);
57 return track; 61 return track;
58 } 62 }
59 63
60 } // namespace webrtc 64 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698