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

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

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/webrtc_audio_renderer.h" 5 #include "content/renderer/media/webrtc_audio_renderer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 DCHECK(media_stream_.get()); 57 DCHECK(media_stream_.get());
58 } 58 }
59 59
60 protected: 60 protected:
61 virtual ~SharedAudioRenderer() { 61 virtual ~SharedAudioRenderer() {
62 DCHECK(thread_checker_.CalledOnValidThread()); 62 DCHECK(thread_checker_.CalledOnValidThread());
63 DVLOG(1) << __FUNCTION__; 63 DVLOG(1) << __FUNCTION__;
64 Stop(); 64 Stop();
65 } 65 }
66 66
67 virtual void Start() OVERRIDE { 67 virtual void Start() override {
68 DCHECK(thread_checker_.CalledOnValidThread()); 68 DCHECK(thread_checker_.CalledOnValidThread());
69 if (started_) 69 if (started_)
70 return; 70 return;
71 started_ = true; 71 started_ = true;
72 delegate_->Start(); 72 delegate_->Start();
73 } 73 }
74 74
75 virtual void Play() OVERRIDE { 75 virtual void Play() override {
76 DCHECK(thread_checker_.CalledOnValidThread()); 76 DCHECK(thread_checker_.CalledOnValidThread());
77 DCHECK(started_); 77 DCHECK(started_);
78 if (playing_state_.playing()) 78 if (playing_state_.playing())
79 return; 79 return;
80 playing_state_.set_playing(true); 80 playing_state_.set_playing(true);
81 on_play_state_changed_.Run(media_stream_, &playing_state_); 81 on_play_state_changed_.Run(media_stream_, &playing_state_);
82 } 82 }
83 83
84 virtual void Pause() OVERRIDE { 84 virtual void Pause() override {
85 DCHECK(thread_checker_.CalledOnValidThread()); 85 DCHECK(thread_checker_.CalledOnValidThread());
86 DCHECK(started_); 86 DCHECK(started_);
87 if (!playing_state_.playing()) 87 if (!playing_state_.playing())
88 return; 88 return;
89 playing_state_.set_playing(false); 89 playing_state_.set_playing(false);
90 on_play_state_changed_.Run(media_stream_, &playing_state_); 90 on_play_state_changed_.Run(media_stream_, &playing_state_);
91 } 91 }
92 92
93 virtual void Stop() OVERRIDE { 93 virtual void Stop() override {
94 DCHECK(thread_checker_.CalledOnValidThread()); 94 DCHECK(thread_checker_.CalledOnValidThread());
95 if (!started_) 95 if (!started_)
96 return; 96 return;
97 Pause(); 97 Pause();
98 started_ = false; 98 started_ = false;
99 delegate_->Stop(); 99 delegate_->Stop();
100 } 100 }
101 101
102 virtual void SetVolume(float volume) OVERRIDE { 102 virtual void SetVolume(float volume) override {
103 DCHECK(thread_checker_.CalledOnValidThread()); 103 DCHECK(thread_checker_.CalledOnValidThread());
104 DCHECK(volume >= 0.0f && volume <= 1.0f); 104 DCHECK(volume >= 0.0f && volume <= 1.0f);
105 playing_state_.set_volume(volume); 105 playing_state_.set_volume(volume);
106 on_play_state_changed_.Run(media_stream_, &playing_state_); 106 on_play_state_changed_.Run(media_stream_, &playing_state_);
107 } 107 }
108 108
109 virtual base::TimeDelta GetCurrentRenderTime() const OVERRIDE { 109 virtual base::TimeDelta GetCurrentRenderTime() const override {
110 DCHECK(thread_checker_.CalledOnValidThread()); 110 DCHECK(thread_checker_.CalledOnValidThread());
111 return delegate_->GetCurrentRenderTime(); 111 return delegate_->GetCurrentRenderTime();
112 } 112 }
113 113
114 virtual bool IsLocalRenderer() const OVERRIDE { 114 virtual bool IsLocalRenderer() const override {
115 DCHECK(thread_checker_.CalledOnValidThread()); 115 DCHECK(thread_checker_.CalledOnValidThread());
116 return delegate_->IsLocalRenderer(); 116 return delegate_->IsLocalRenderer();
117 } 117 }
118 118
119 private: 119 private:
120 base::ThreadChecker thread_checker_; 120 base::ThreadChecker thread_checker_;
121 const scoped_refptr<MediaStreamAudioRenderer> delegate_; 121 const scoped_refptr<MediaStreamAudioRenderer> delegate_;
122 const scoped_refptr<webrtc::MediaStreamInterface> media_stream_; 122 const scoped_refptr<webrtc::MediaStreamInterface> media_stream_;
123 bool started_; 123 bool started_;
124 WebRtcAudioRenderer::PlayingState playing_state_; 124 WebRtcAudioRenderer::PlayingState playing_state_;
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 if (RemovePlayingState(source, state)) 552 if (RemovePlayingState(source, state))
553 EnterPauseState(); 553 EnterPauseState();
554 } else if (AddPlayingState(source, state)) { 554 } else if (AddPlayingState(source, state)) {
555 EnterPlayState(); 555 EnterPlayState();
556 } 556 }
557 UpdateSourceVolume(source); 557 UpdateSourceVolume(source);
558 } 558 }
559 } 559 }
560 560
561 } // namespace content 561 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc_audio_renderer.h ('k') | content/renderer/media/webrtc_identity_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698