OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/webmediaplayer_ms.h" | 5 #include "content/renderer/media/webmediaplayer_ms.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <limits> | 8 #include <limits> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 if (audio_renderer_.get()) | 226 if (audio_renderer_.get()) |
227 audio_renderer_->SetVolume(volume_ * volume_multiplier_); | 227 audio_renderer_->SetVolume(volume_ * volume_multiplier_); |
228 } | 228 } |
229 | 229 |
230 void WebMediaPlayerMS::setSinkId( | 230 void WebMediaPlayerMS::setSinkId( |
231 const blink::WebString& sink_id, | 231 const blink::WebString& sink_id, |
232 const blink::WebSecurityOrigin& security_origin, | 232 const blink::WebSecurityOrigin& security_origin, |
233 blink::WebSetSinkIdCallbacks* web_callback) { | 233 blink::WebSetSinkIdCallbacks* web_callback) { |
234 DVLOG(1) << __FUNCTION__; | 234 DVLOG(1) << __FUNCTION__; |
235 DCHECK(thread_checker_.CalledOnValidThread()); | 235 DCHECK(thread_checker_.CalledOnValidThread()); |
236 const media::SwitchOutputDeviceCB callback = | 236 const media::OutputDeviceStatusCB callback = |
237 media::ConvertToSwitchOutputDeviceCB(web_callback); | 237 media::ConvertToOutputDeviceStatusCB(web_callback); |
238 if (audio_renderer_ && audio_renderer_->GetOutputDevice()) { | 238 if (audio_renderer_) { |
239 audio_renderer_->GetOutputDevice()->SwitchOutputDevice( | 239 audio_renderer_->SwitchOutputDevice(sink_id.utf8(), security_origin, |
240 sink_id.utf8(), security_origin, callback); | 240 callback); |
241 } else { | 241 } else { |
242 callback.Run(media::OUTPUT_DEVICE_STATUS_ERROR_INTERNAL); | 242 callback.Run(media::OUTPUT_DEVICE_STATUS_ERROR_INTERNAL); |
243 } | 243 } |
244 } | 244 } |
245 | 245 |
246 void WebMediaPlayerMS::setPreload(WebMediaPlayer::Preload preload) { | 246 void WebMediaPlayerMS::setPreload(WebMediaPlayer::Preload preload) { |
247 DCHECK(thread_checker_.CalledOnValidThread()); | 247 DCHECK(thread_checker_.CalledOnValidThread()); |
248 } | 248 } |
249 | 249 |
250 bool WebMediaPlayerMS::hasVideo() const { | 250 bool WebMediaPlayerMS::hasVideo() const { |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
529 media::SkCanvasVideoRenderer* WebMediaPlayerMS::GetSkCanvasVideoRenderer() { | 529 media::SkCanvasVideoRenderer* WebMediaPlayerMS::GetSkCanvasVideoRenderer() { |
530 return &video_renderer_; | 530 return &video_renderer_; |
531 } | 531 } |
532 | 532 |
533 void WebMediaPlayerMS::ResetCanvasCache() { | 533 void WebMediaPlayerMS::ResetCanvasCache() { |
534 DCHECK(thread_checker_.CalledOnValidThread()); | 534 DCHECK(thread_checker_.CalledOnValidThread()); |
535 video_renderer_.ResetCache(); | 535 video_renderer_.ResetCache(); |
536 } | 536 } |
537 | 537 |
538 } // namespace content | 538 } // namespace content |
OLD | NEW |