content/renderer/media/webmediaplayer_ms.cc - Issue 1809093003: Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/webmediaplayer_ms.cc

Issue 1809093003: Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing guidou's comments Created 4 years, 9 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 side-by-side diff with in-line comments

Download patch

« content/renderer/media/audio_renderer_mixer_manager_unittest.cc ('K') | « content/renderer/media/track_audio_renderer.cc ('k') | content/renderer/media/webrtc_audio_renderer.h » ('j') | media/base/audio_renderer_mixer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webmediaplayer_ms.cc

diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc

index 9cad1e5013e951e8755045a989073a4243f96eef..edbf0808ed2567e6c7ebad28fc84127ce6b23414 100644

--- a/content/renderer/media/webmediaplayer_ms.cc

+++ b/content/renderer/media/webmediaplayer_ms.cc

@@ -236,11 +236,11 @@ void WebMediaPlayerMS::setSinkId(

blink::WebSetSinkIdCallbacks* web_callback) {

DVLOG(1) << __FUNCTION__;

DCHECK(thread_checker_.CalledOnValidThread());

- const media::SwitchOutputDeviceCB callback =

- media::ConvertToSwitchOutputDeviceCB(web_callback);

- if (audio_renderer_ && audio_renderer_->GetOutputDevice()) {

- audio_renderer_->GetOutputDevice()->SwitchOutputDevice(

- sink_id.utf8(), security_origin, callback);

+ const media::OutputDeviceStatusCB callback =

+ media::ConvertToOutputDeviceStatusCB(web_callback);

+ if (audio_renderer_) {

+ audio_renderer_->SwitchOutputDevice(sink_id.utf8(), security_origin,

+ callback);

} else {

callback.Run(media::OUTPUT_DEVICE_STATUS_ERROR_INTERNAL);

}