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

Unified Diff: content/renderer/media/media_stream_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: Correct handling of 0.0fps frame rate sources 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_stream_track.cc
diff --git a/content/renderer/media/media_stream_track.cc b/content/renderer/media/media_stream_track.cc
index 529bc384e894be95dbe6b39a37286e25e296566d..9aca963af4f47bd57b38834975700a256ce964fd 100644
--- a/content/renderer/media/media_stream_track.cc
+++ b/content/renderer/media/media_stream_track.cc
@@ -20,18 +20,31 @@ MediaStreamTrack* MediaStreamTrack::GetTrack(
MediaStreamTrack::MediaStreamTrack(
webrtc::MediaStreamTrackInterface* track, bool is_local_track)
: track_(track),
- is_local_track_(is_local_track) {
+ muted_state_(false),
+ is_local_track_(is_local_track){
}
MediaStreamTrack::~MediaStreamTrack() {
}
void MediaStreamTrack::SetEnabled(bool enabled) {
+ DCHECK(thread_checker_.CalledOnValidThread());
if (track_)
track_->set_enabled(enabled);
}
+void MediaStreamTrack::SetMutedState(bool muted_state) {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ muted_state_ = muted_state;
+}
+
+bool MediaStreamTrack::GetMutedState(void) const {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ return muted_state_;
+}
+
void MediaStreamTrack::Stop() {
+ DCHECK(thread_checker_.CalledOnValidThread());
// Stop means that a track should be stopped permanently. But
// since there is no proper way of doing that on a remote track, we can
// at least disable the track. Blink will not call down to the content layer
@@ -41,6 +54,7 @@ void MediaStreamTrack::Stop() {
}
webrtc::AudioTrackInterface* MediaStreamTrack::GetAudioAdapter() {
+ DCHECK(thread_checker_.CalledOnValidThread());
return static_cast<webrtc::AudioTrackInterface*>(track_.get());
}
« no previous file with comments | « content/renderer/media/media_stream_track.h ('k') | content/renderer/media/media_stream_video_capturer_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698