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

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

Issue 1764693004: Fix VideoTrack VideoSinkWants for renderers. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 | « no previous file | no next file » | 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 VideoSourceInterface* video_source) 20 VideoSourceInterface* 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;
nisse-webrtc 2016/03/04 10:08:14 nit: Could move the declaration and init a block u
23 if (video_source_) 29 if (video_source_)
24 video_source_->AddOrUpdateSink(&renderers_, rtc::VideoSinkWants()); 30 video_source_->AddOrUpdateSink(&renderers_, wants);
25 } 31 }
26 32
27 VideoTrack::~VideoTrack() { 33 VideoTrack::~VideoTrack() {
28 if (video_source_) 34 if (video_source_)
29 video_source_->RemoveSink(&renderers_); 35 video_source_->RemoveSink(&renderers_);
30 } 36 }
31 37
32 std::string VideoTrack::kind() const { 38 std::string VideoTrack::kind() const {
33 return kVideoKind; 39 return kVideoKind;
34 } 40 }
(...skipping 20 matching lines...) Expand all
55 61
56 rtc::scoped_refptr<VideoTrack> VideoTrack::Create( 62 rtc::scoped_refptr<VideoTrack> VideoTrack::Create(
57 const std::string& id, 63 const std::string& id,
58 VideoSourceInterface* source) { 64 VideoSourceInterface* source) {
59 rtc::RefCountedObject<VideoTrack>* track = 65 rtc::RefCountedObject<VideoTrack>* track =
60 new rtc::RefCountedObject<VideoTrack>(id, source); 66 new rtc::RefCountedObject<VideoTrack>(id, source);
61 return track; 67 return track;
62 } 68 }
63 69
64 } // namespace webrtc 70 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698