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

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

Issue 2011163004: MediaVideoStreamTrack should store weak reference to the media source. Since MediaVideoStreamSource… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 6 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 | « content/renderer/media/media_stream_video_track.h ('k') | 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 // 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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 MediaStreamVideoTrack::MediaStreamVideoTrack( 222 MediaStreamVideoTrack::MediaStreamVideoTrack(
223 MediaStreamVideoSource* source, 223 MediaStreamVideoSource* source,
224 const blink::WebMediaConstraints& constraints, 224 const blink::WebMediaConstraints& constraints,
225 const MediaStreamVideoSource::ConstraintsCallback& callback, 225 const MediaStreamVideoSource::ConstraintsCallback& callback,
226 bool enabled) 226 bool enabled)
227 : MediaStreamTrack(true), 227 : MediaStreamTrack(true),
228 frame_deliverer_( 228 frame_deliverer_(
229 new MediaStreamVideoTrack::FrameDeliverer(source->io_task_runner(), 229 new MediaStreamVideoTrack::FrameDeliverer(source->io_task_runner(),
230 enabled)), 230 enabled)),
231 constraints_(constraints), 231 constraints_(constraints),
232 source_(source) { 232 source_(source->GetWeakPtr()) {
233 DCHECK(!constraints.isNull()); 233 DCHECK(!constraints.isNull());
234 source->AddTrack(this, 234 source->AddTrack(this,
235 base::Bind( 235 base::Bind(
236 &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, 236 &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO,
237 frame_deliverer_), 237 frame_deliverer_),
238 constraints, callback); 238 constraints, callback);
239 } 239 }
240 240
241 MediaStreamVideoTrack::~MediaStreamVideoTrack() { 241 MediaStreamVideoTrack::~MediaStreamVideoTrack() {
242 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 242 DCHECK(main_render_thread_checker_.CalledOnValidThread());
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 } 282 }
283 283
284 void MediaStreamVideoTrack::OnReadyStateChanged( 284 void MediaStreamVideoTrack::OnReadyStateChanged(
285 blink::WebMediaStreamSource::ReadyState state) { 285 blink::WebMediaStreamSource::ReadyState state) {
286 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 286 DCHECK(main_render_thread_checker_.CalledOnValidThread());
287 for (auto* sink : sinks_) 287 for (auto* sink : sinks_)
288 sink->OnReadyStateChanged(state); 288 sink->OnReadyStateChanged(state);
289 } 289 }
290 290
291 } // namespace content 291 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_video_track.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698