media/audio/null_audio_sink.h - 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: media/audio/null_audio_sink.h

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

Patch Set: Replace RestartableAudioRendererSink with SwitchableAudioRendererSink in webmediaplayer_impl unit t… 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.cc ('K') | « media/audio/audio_output_device.cc ('k') | media/audio/null_audio_sink.cc » ('j') | media/base/audio_renderer_mixer_input.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/audio/null_audio_sink.h

diff --git a/media/audio/null_audio_sink.h b/media/audio/null_audio_sink.h

index 5d4e7bc89a495b51279ebb221e764d5bfa37def1..e183df6c725e9ea8ecba9fe2ffe7dfceb97f3afc 100644

--- a/media/audio/null_audio_sink.h

+++ b/media/audio/null_audio_sink.h

@@ -22,7 +22,7 @@ class FakeAudioWorker;

class OutputDevice;

class MEDIA_EXPORT NullAudioSink

- : NON_EXPORTED_BASE(public RestartableAudioRendererSink) {

+ : NON_EXPORTED_BASE(public SwitchableAudioRendererSink) {

public:

NullAudioSink(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);

@@ -35,6 +35,9 @@ class MEDIA_EXPORT NullAudioSink

void Play() override;

bool SetVolume(double volume) override;

OutputDevice* GetOutputDevice() override;

+ void SwitchOutputDevice(const std::string& device_id,

+ const url::Origin& security_origin,

+ const SwitchOutputDeviceCB& callback) override;

// Enables audio frame hashing. Must be called prior to Initialize().

void StartAudioHashForTesting();