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

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

Issue 480233007: Remove implicit conversions from scoped_refptr to T* in content/renderer/media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_track.h" 5 #include "content/renderer/media/media_stream_track.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 8 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
9 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 9 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
10 10
(...skipping 11 matching lines...) Expand all
22 : track_(track), 22 : track_(track),
23 muted_state_(false), 23 muted_state_(false),
24 is_local_track_(is_local_track){ 24 is_local_track_(is_local_track){
25 } 25 }
26 26
27 MediaStreamTrack::~MediaStreamTrack() { 27 MediaStreamTrack::~MediaStreamTrack() {
28 } 28 }
29 29
30 void MediaStreamTrack::SetEnabled(bool enabled) { 30 void MediaStreamTrack::SetEnabled(bool enabled) {
31 DCHECK(thread_checker_.CalledOnValidThread()); 31 DCHECK(thread_checker_.CalledOnValidThread());
32 if (track_) 32 if (track_.get())
33 track_->set_enabled(enabled); 33 track_->set_enabled(enabled);
34 } 34 }
35 35
36 void MediaStreamTrack::SetMutedState(bool muted_state) { 36 void MediaStreamTrack::SetMutedState(bool muted_state) {
37 DCHECK(thread_checker_.CalledOnValidThread()); 37 DCHECK(thread_checker_.CalledOnValidThread());
38 muted_state_ = muted_state; 38 muted_state_ = muted_state;
39 } 39 }
40 40
41 bool MediaStreamTrack::GetMutedState(void) const { 41 bool MediaStreamTrack::GetMutedState(void) const {
42 DCHECK(thread_checker_.CalledOnValidThread()); 42 DCHECK(thread_checker_.CalledOnValidThread());
43 return muted_state_; 43 return muted_state_;
44 } 44 }
45 45
46 void MediaStreamTrack::Stop() { 46 void MediaStreamTrack::Stop() {
47 DCHECK(thread_checker_.CalledOnValidThread()); 47 DCHECK(thread_checker_.CalledOnValidThread());
48 // Stop means that a track should be stopped permanently. But 48 // Stop means that a track should be stopped permanently. But
49 // since there is no proper way of doing that on a remote track, we can 49 // since there is no proper way of doing that on a remote track, we can
50 // at least disable the track. Blink will not call down to the content layer 50 // at least disable the track. Blink will not call down to the content layer
51 // after a track has been stopped. 51 // after a track has been stopped.
52 if (track_) 52 if (track_.get())
53 track_->set_enabled(false); 53 track_->set_enabled(false);
54 } 54 }
55 55
56 webrtc::AudioTrackInterface* MediaStreamTrack::GetAudioAdapter() { 56 webrtc::AudioTrackInterface* MediaStreamTrack::GetAudioAdapter() {
57 DCHECK(thread_checker_.CalledOnValidThread()); 57 DCHECK(thread_checker_.CalledOnValidThread());
58 return static_cast<webrtc::AudioTrackInterface*>(track_.get()); 58 return static_cast<webrtc::AudioTrackInterface*>(track_.get());
59 } 59 }
60 60
61 } // namespace content 61 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_audio_source.cc ('k') | content/renderer/media/media_stream_video_track.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698