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

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

Issue 1779063003: Refactor VideoTracks to forward all sinks to its source (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 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
« no previous file with comments | « webrtc/api/videotrack.h ('k') | webrtc/api/videotrack_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 #include "webrtc/api/videotrack.h" 11 #include "webrtc/api/videotrack.h"
12 12
13 #include <string> 13 #include <string>
14 14
15 namespace webrtc { 15 namespace webrtc {
16 16
17 const char MediaStreamTrackInterface::kVideoKind[] = "video"; 17 const char MediaStreamTrackInterface::kVideoKind[] = "video";
18 18
19 VideoTrack::VideoTrack(const std::string& label, 19 VideoTrack::VideoTrack(const std::string& label,
20 VideoTrackSourceInterface* video_source) 20 VideoTrackSourceInterface* video_source)
21 : MediaStreamTrack<VideoTrackInterface>(label), 21 : MediaStreamTrack<VideoTrackInterface>(label),
22 video_source_(video_source) { 22 video_source_(video_source) {
23 // TODO(perkj): Sinks should register directly to the source so that
24 // VideoSinkWants can be applied correctly per sink. For now, |renderers_|
25 // must be able to apply rotation. Note that this is only actual renderers,
26 // not sinks that connect directly to cricket::VideoCapture.
27 rtc::VideoSinkWants wants;
28 wants.rotation_applied = false;
29 if (video_source_)
30 video_source_->AddOrUpdateSink(&renderers_, wants);
31 } 23 }
32 24
33 VideoTrack::~VideoTrack() { 25 VideoTrack::~VideoTrack() {
34 if (video_source_)
35 video_source_->RemoveSink(&renderers_);
36 } 26 }
37 27
38 std::string VideoTrack::kind() const { 28 std::string VideoTrack::kind() const {
39 return kVideoKind; 29 return kVideoKind;
40 } 30 }
41 31
42 void VideoTrack::AddOrUpdateSink( 32 void VideoTrack::AddOrUpdateSink(
43 rtc::VideoSinkInterface<cricket::VideoFrame>* sink, 33 rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
44 const rtc::VideoSinkWants& wants) { 34 const rtc::VideoSinkWants& wants) {
45 renderers_.AddOrUpdateSink(sink, wants); 35 RTC_DCHECK(thread_checker_.CalledOnValidThread());
36 VideoSourceBase::AddOrUpdateSink(sink, wants);
37 rtc::VideoSinkWants modified_wants = wants;
38 modified_wants.black_frames = !enabled();
39 video_source_->AddOrUpdateSink(sink, modified_wants);
46 } 40 }
47 41
48 void VideoTrack::RemoveSink( 42 void VideoTrack::RemoveSink(
49 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) { 43 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
50 renderers_.RemoveSink(sink); 44 RTC_DCHECK(thread_checker_.CalledOnValidThread());
45 VideoSourceBase::RemoveSink(sink);
46 video_source_->RemoveSink(sink);
51 } 47 }
52 48
53 bool VideoTrack::set_enabled(bool enable) { 49 bool VideoTrack::set_enabled(bool enable) {
54 renderers_.SetEnabled(enable); 50 RTC_DCHECK(thread_checker_.CalledOnValidThread());
51 for (auto& sink_pair : sink_pairs()) {
52 rtc::VideoSinkWants modified_wants = sink_pair.wants;
53 modified_wants.black_frames = !enable;
54 video_source_->AddOrUpdateSink(sink_pair.sink, modified_wants);
55 }
55 return MediaStreamTrack<VideoTrackInterface>::set_enabled(enable); 56 return MediaStreamTrack<VideoTrackInterface>::set_enabled(enable);
56 } 57 }
57 58
58 rtc::scoped_refptr<VideoTrack> VideoTrack::Create( 59 rtc::scoped_refptr<VideoTrack> VideoTrack::Create(
59 const std::string& id, 60 const std::string& id,
60 VideoTrackSourceInterface* source) { 61 VideoTrackSourceInterface* source) {
61 rtc::RefCountedObject<VideoTrack>* track = 62 rtc::RefCountedObject<VideoTrack>* track =
62 new rtc::RefCountedObject<VideoTrack>(id, source); 63 new rtc::RefCountedObject<VideoTrack>(id, source);
63 return track; 64 return track;
64 } 65 }
65 66
66 } // namespace webrtc 67 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/videotrack.h ('k') | webrtc/api/videotrack_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698