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

Side by Side Diff: content/renderer/media/media_stream_video_track.cc

Issue 246433006: Change MediaStreamVideoSource to output different resolutions to different tracks depending on the … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 7 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 #include "content/renderer/media/media_stream_video_track.h" 5 #include "content/renderer/media/media_stream_video_track.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/renderer/media/video_frame_deliverer.h" 8 #include "content/renderer/media/video_frame_deliverer.h"
9 #include "media/base/bind_to_current_loop.h" 9 #include "media/base/bind_to_current_loop.h"
10 10
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 source_(source) { 116 source_(source) {
117 DCHECK(!constraints.isNull()); 117 DCHECK(!constraints.isNull());
118 source->AddTrack(this, 118 source->AddTrack(this,
119 base::Bind( 119 base::Bind(
120 &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, 120 &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO,
121 frame_deliverer_), 121 frame_deliverer_),
122 constraints, callback); 122 constraints, callback);
123 } 123 }
124 124
125 MediaStreamVideoTrack::~MediaStreamVideoTrack() { 125 MediaStreamVideoTrack::~MediaStreamVideoTrack() {
126 DCHECK(thread_checker_.CalledOnValidThread());
126 Stop(); 127 Stop();
127 DVLOG(3) << "~MediaStreamVideoTrack()"; 128 DVLOG(3) << "~MediaStreamVideoTrack()";
128 } 129 }
129 130
130 void MediaStreamVideoTrack::AddSink( 131 void MediaStreamVideoTrack::AddSink(
131 MediaStreamVideoSink* sink, const VideoCaptureDeliverFrameCB& callback) { 132 MediaStreamVideoSink* sink, const VideoCaptureDeliverFrameCB& callback) {
132 DCHECK(thread_checker_.CalledOnValidThread()); 133 DCHECK(thread_checker_.CalledOnValidThread());
133 frame_deliverer_->AddSink(sink, callback); 134 frame_deliverer_->AddSink(sink, callback);
134 } 135 }
135 136
(...skipping 27 matching lines...) Expand all
163 blink::WebMediaStreamSource::ReadyState state) { 164 blink::WebMediaStreamSource::ReadyState state) {
164 DCHECK(thread_checker_.CalledOnValidThread()); 165 DCHECK(thread_checker_.CalledOnValidThread());
165 const std::vector<MediaStreamVideoSink*>& sinks = frame_deliverer_->sinks(); 166 const std::vector<MediaStreamVideoSink*>& sinks = frame_deliverer_->sinks();
166 for (std::vector<MediaStreamVideoSink*>::const_iterator it = sinks.begin(); 167 for (std::vector<MediaStreamVideoSink*>::const_iterator it = sinks.begin();
167 it != sinks.end(); ++it) { 168 it != sinks.end(); ++it) {
168 (*it)->OnReadyStateChanged(state); 169 (*it)->OnReadyStateChanged(state);
169 } 170 }
170 } 171 }
171 172
172 } // namespace content 173 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_video_source_unittest.cc ('k') | content/renderer/media/mock_media_stream_video_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698