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

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

Issue 366243003: VideoTrackAdapter: Add passing frames monitor, notify MSVCS -> MSVTrack(s) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: grunell@ comments and added a UT with 1 source muted pinging two tracks. Created 6 years, 5 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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "media/base/bind_to_current_loop.h"
11 10
12 namespace content { 11 namespace content {
13 12
14 namespace { 13 namespace {
15 void ResetCallback(scoped_ptr<VideoCaptureDeliverFrameCB> callback) { 14 void ResetCallback(scoped_ptr<VideoCaptureDeliverFrameCB> callback) {
16 // |callback| will be deleted when this exits. 15 // |callback| will be deleted when this exits.
17 } 16 }
18 } // namespace 17 } // namespace
19 18
20 // MediaStreamVideoTrack::FrameDeliverer is a helper class used for registering 19 // MediaStreamVideoTrack::FrameDeliverer is a helper class used for registering
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 232
234 void MediaStreamVideoTrack::OnReadyStateChanged( 233 void MediaStreamVideoTrack::OnReadyStateChanged(
235 blink::WebMediaStreamSource::ReadyState state) { 234 blink::WebMediaStreamSource::ReadyState state) {
236 DCHECK(thread_checker_.CalledOnValidThread()); 235 DCHECK(thread_checker_.CalledOnValidThread());
237 for (std::vector<MediaStreamVideoSink*>::const_iterator it = sinks_.begin(); 236 for (std::vector<MediaStreamVideoSink*>::const_iterator it = sinks_.begin();
238 it != sinks_.end(); ++it) { 237 it != sinks_.end(); ++it) {
239 (*it)->OnReadyStateChanged(state); 238 (*it)->OnReadyStateChanged(state);
240 } 239 }
241 } 240 }
242 241
242 void MediaStreamVideoTrack::SetMutedState(bool muted_state) {
243 DCHECK(thread_checker_.CalledOnValidThread());
244 muted_state_ = muted_state;
245 }
246
247 bool MediaStreamVideoTrack::GetMutedState(void) const {
Henrik Grunell 2014/07/10 08:41:34 This doesn't need to be overridden, does the same
248 DCHECK(thread_checker_.CalledOnValidThread());
249 return muted_state_;
250 }
251
243 } // namespace content 252 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698