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

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

Issue 1122393004: Add support for switching the audio output device for HTMLMediaElements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes to MediaPlayers so that they invoke callbacks in the correct threads. First complete implem… Created 5 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
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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 delegate_->Stop(); 99 delegate_->Stop();
100 } 100 }
101 101
102 void SetVolume(float volume) override { 102 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 void SwitchOutputDevice(const std::string& device_id,
110 const GURL& security_origin,
111 const base::Callback<void(int)>& callback) override {
112 DCHECK(thread_checker_.CalledOnValidThread());
113 DVLOG(1) << __PRETTY_FUNCTION__;
114 delegate_->SwitchOutputDevice(device_id, security_origin, callback);
115 }
116
109 base::TimeDelta GetCurrentRenderTime() const override { 117 base::TimeDelta GetCurrentRenderTime() const override {
110 DCHECK(thread_checker_.CalledOnValidThread()); 118 DCHECK(thread_checker_.CalledOnValidThread());
111 return delegate_->GetCurrentRenderTime(); 119 return delegate_->GetCurrentRenderTime();
112 } 120 }
113 121
114 bool IsLocalRenderer() const override { 122 bool IsLocalRenderer() const override {
115 DCHECK(thread_checker_.CalledOnValidThread()); 123 DCHECK(thread_checker_.CalledOnValidThread());
116 return delegate_->IsLocalRenderer(); 124 return delegate_->IsLocalRenderer();
117 } 125 }
118 126
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 } 407 }
400 408
401 void WebRtcAudioRenderer::SetVolume(float volume) { 409 void WebRtcAudioRenderer::SetVolume(float volume) {
402 DCHECK(thread_checker_.CalledOnValidThread()); 410 DCHECK(thread_checker_.CalledOnValidThread());
403 DCHECK(volume >= 0.0f && volume <= 1.0f); 411 DCHECK(volume >= 0.0f && volume <= 1.0f);
404 412
405 playing_state_.set_volume(volume); 413 playing_state_.set_volume(volume);
406 OnPlayStateChanged(media_stream_, &playing_state_); 414 OnPlayStateChanged(media_stream_, &playing_state_);
407 } 415 }
408 416
417 void WebRtcAudioRenderer::SwitchOutputDevice(
418 const std::string& device_id,
419 const GURL& security_origin,
420 const base::Callback<void(int)>& callback) {
421 DCHECK(thread_checker_.CalledOnValidThread());
422 DVLOG(1) << __PRETTY_FUNCTION__;
423 sink_->SwitchOutputDevice(device_id, security_origin, callback);
424 }
425
409 base::TimeDelta WebRtcAudioRenderer::GetCurrentRenderTime() const { 426 base::TimeDelta WebRtcAudioRenderer::GetCurrentRenderTime() const {
410 DCHECK(thread_checker_.CalledOnValidThread()); 427 DCHECK(thread_checker_.CalledOnValidThread());
411 base::AutoLock auto_lock(lock_); 428 base::AutoLock auto_lock(lock_);
412 return current_time_; 429 return current_time_;
413 } 430 }
414 431
415 bool WebRtcAudioRenderer::IsLocalRenderer() const { 432 bool WebRtcAudioRenderer::IsLocalRenderer() const {
416 return false; 433 return false;
417 } 434 }
418 435
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 if (RemovePlayingState(source, state)) 573 if (RemovePlayingState(source, state))
557 EnterPauseState(); 574 EnterPauseState();
558 } else if (AddPlayingState(source, state)) { 575 } else if (AddPlayingState(source, state)) {
559 EnterPlayState(); 576 EnterPlayState();
560 } 577 }
561 UpdateSourceVolume(source); 578 UpdateSourceVolume(source);
562 } 579 }
563 } 580 }
564 581
565 } // namespace content 582 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698