content/renderer/media/webmediaplayer_ms.cc - Issue 1323403005: Allow AudioOutputDevice objects to be initialized with a specific hardware output device and store …

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 1323403005: Allow AudioOutputDevice objects to be initialized with a specific hardware output device and store … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert DCHECK in destructor Created 5 years, 3 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

« no previous file with comments | « content/renderer/media/renderer_webaudiodevice_impl.cc ('k') | content/renderer/media/webrtc_audio_renderer.cc » ('j') | content/renderer/pepper/pepper_platform_audio_output.cc » ('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 fe89d6f618235770b306d8a2f2a8640ce036c567..fd75ecf8e1be86f38621d19861dad5ef1223428b 100644

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

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

@@ -5,6 +5,7 @@

#include "content/renderer/media/webmediaplayer_ms.h"

#include <limits>

+#include <string>

#include "base/bind.h"

#include "base/callback.h"

@@ -265,7 +266,7 @@ void WebMediaPlayerMS::setSinkId(const blink::WebString& device_id,

return;

}

- callback.Run(media::SWITCH_OUTPUT_DEVICE_RESULT_ERROR_NOT_SUPPORTED);

+ callback.Run(media::SWITCH_OUTPUT_DEVICE_RESULT_ERROR_INTERNAL);

}

void WebMediaPlayerMS::setPreload(WebMediaPlayer::Preload preload) {