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

Side by Side Diff: media/mojo/services/mojo_renderer_service.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 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 "media/mojo/services/mojo_renderer_service.h" 5 #include "media/mojo/services/mojo_renderer_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 void MojoRendererService::SetPlaybackRate(double playback_rate) { 96 void MojoRendererService::SetPlaybackRate(double playback_rate) {
97 DVLOG(2) << __FUNCTION__ << ": " << playback_rate; 97 DVLOG(2) << __FUNCTION__ << ": " << playback_rate;
98 DCHECK_EQ(state_, STATE_PLAYING); 98 DCHECK_EQ(state_, STATE_PLAYING);
99 renderer_->SetPlaybackRate(playback_rate); 99 renderer_->SetPlaybackRate(playback_rate);
100 } 100 }
101 101
102 void MojoRendererService::SetVolume(float volume) { 102 void MojoRendererService::SetVolume(float volume) {
103 renderer_->SetVolume(volume); 103 renderer_->SetVolume(volume);
104 } 104 }
105 105
106 void MojoRendererService::SwitchAudioOutputDevice(
107 const mojo::String& device_id, const mojo::String& security_origin) {
108 renderer_->SwitchAudioOutputDevice(device_id.get(),
109 GURL(security_origin.get()).GetOrigin());
110 }
111
112
106 void MojoRendererService::OnStreamReady(const mojo::Closure& callback) { 113 void MojoRendererService::OnStreamReady(const mojo::Closure& callback) {
107 DCHECK_EQ(state_, STATE_INITIALIZING); 114 DCHECK_EQ(state_, STATE_INITIALIZING);
108 115
109 renderer_->Initialize( 116 renderer_->Initialize(
110 stream_provider_.get(), 117 stream_provider_.get(),
111 base::Bind( 118 base::Bind(
112 &MojoRendererService::OnRendererInitializeDone, weak_this_, callback), 119 &MojoRendererService::OnRendererInitializeDone, weak_this_, callback),
113 base::Bind(&MojoRendererService::OnUpdateStatistics, weak_this_), 120 base::Bind(&MojoRendererService::OnUpdateStatistics, weak_this_),
114 base::Bind(&MojoRendererService::OnBufferingStateChanged, weak_this_), 121 base::Bind(&MojoRendererService::OnBufferingStateChanged, weak_this_),
115 base::Bind(&MojoRendererService::OnRendererEnded, weak_this_), 122 base::Bind(&MojoRendererService::OnRendererEnded, weak_this_),
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 } 186 }
180 187
181 void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) { 188 void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) {
182 DVLOG(1) << __FUNCTION__; 189 DVLOG(1) << __FUNCTION__;
183 DCHECK_EQ(state_, STATE_FLUSHING); 190 DCHECK_EQ(state_, STATE_FLUSHING);
184 state_ = STATE_PLAYING; 191 state_ = STATE_PLAYING;
185 callback.Run(); 192 callback.Run();
186 } 193 }
187 194
188 } // namespace media 195 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698