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

Side by Side Diff: talk/app/webrtc/videotrack.cc

Issue 1413983004: Reland of Adding the ability to create an RtpSender without a track. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing merge issue. Created 5 years, 1 month 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 | « talk/app/webrtc/rtpsenderreceiver_unittest.cc ('k') | talk/app/webrtc/webrtcsession.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 * libjingle 2 * libjingle
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 13 matching lines...) Expand all
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/videotrack.h" 28 #include "talk/app/webrtc/videotrack.h"
29 29
30 #include <string> 30 #include <string>
31 31
32 namespace webrtc { 32 namespace webrtc {
33 33
34 static const char kVideoTrackKind[] = "video"; 34 const char MediaStreamTrackInterface::kVideoKind[] = "video";
35 35
36 VideoTrack::VideoTrack(const std::string& label, 36 VideoTrack::VideoTrack(const std::string& label,
37 VideoSourceInterface* video_source) 37 VideoSourceInterface* video_source)
38 : MediaStreamTrack<VideoTrackInterface>(label), 38 : MediaStreamTrack<VideoTrackInterface>(label),
39 video_source_(video_source) { 39 video_source_(video_source) {
40 if (video_source_) 40 if (video_source_)
41 video_source_->AddSink(&renderers_); 41 video_source_->AddSink(&renderers_);
42 } 42 }
43 43
44 VideoTrack::~VideoTrack() { 44 VideoTrack::~VideoTrack() {
45 if (video_source_) 45 if (video_source_)
46 video_source_->RemoveSink(&renderers_); 46 video_source_->RemoveSink(&renderers_);
47 } 47 }
48 48
49 std::string VideoTrack::kind() const { 49 std::string VideoTrack::kind() const {
50 return kVideoTrackKind; 50 return kVideoKind;
51 } 51 }
52 52
53 void VideoTrack::AddRenderer(VideoRendererInterface* renderer) { 53 void VideoTrack::AddRenderer(VideoRendererInterface* renderer) {
54 renderers_.AddRenderer(renderer); 54 renderers_.AddRenderer(renderer);
55 } 55 }
56 56
57 void VideoTrack::RemoveRenderer(VideoRendererInterface* renderer) { 57 void VideoTrack::RemoveRenderer(VideoRendererInterface* renderer) {
58 renderers_.RemoveRenderer(renderer); 58 renderers_.RemoveRenderer(renderer);
59 } 59 }
60 60
61 bool VideoTrack::set_enabled(bool enable) { 61 bool VideoTrack::set_enabled(bool enable) {
62 renderers_.SetEnabled(enable); 62 renderers_.SetEnabled(enable);
63 return MediaStreamTrack<VideoTrackInterface>::set_enabled(enable); 63 return MediaStreamTrack<VideoTrackInterface>::set_enabled(enable);
64 } 64 }
65 65
66 rtc::scoped_refptr<VideoTrack> VideoTrack::Create( 66 rtc::scoped_refptr<VideoTrack> VideoTrack::Create(
67 const std::string& id, VideoSourceInterface* source) { 67 const std::string& id, VideoSourceInterface* source) {
68 rtc::RefCountedObject<VideoTrack>* track = 68 rtc::RefCountedObject<VideoTrack>* track =
69 new rtc::RefCountedObject<VideoTrack>(id, source); 69 new rtc::RefCountedObject<VideoTrack>(id, source);
70 return track; 70 return track;
71 } 71 }
72 72
73 } // namespace webrtc 73 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/rtpsenderreceiver_unittest.cc ('k') | talk/app/webrtc/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698