media/mojo/services/service_factory_impl.h - Issue 2016053003: Add audio_device_id in mojo media ServiceFactory CreateRenderer api.

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/mojo/services/service_factory_impl.h

Issue 2016053003: Add audio_device_id in mojo media ServiceFactory CreateRenderer api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Fix compile error Created 4 years, 7 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

« media/mojo/services/mojo_media_client.h ('K') | « media/mojo/services/mojo_media_client.cc ('k') | media/mojo/services/service_factory_impl.cc » ('j') | media/mojo/services/service_factory_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/mojo/services/service_factory_impl.h

diff --git a/media/mojo/services/service_factory_impl.h b/media/mojo/services/service_factory_impl.h

index ce970c9c0dccf4c5f9a398576d5f8f0ca7240743..f6a7aeae7bad5a11ae722492fe7c5b4c926ce294 100644

--- a/media/mojo/services/service_factory_impl.h

+++ b/media/mojo/services/service_factory_impl.h

@@ -39,16 +39,11 @@ class ServiceFactoryImpl : public mojom::ServiceFactory {

// mojom::ServiceFactory implementation.

void CreateAudioDecoder(mojom::AudioDecoderRequest request) final;

void CreateVideoDecoder(mojom::VideoDecoderRequest request) final;

- void CreateRenderer(mojom::RendererRequest request) final;

+ void CreateRenderer(mojom::RendererRequest request,

+ const mojo::String& audio_device_id) final;

void CreateCdm(mojom::ContentDecryptionModuleRequest request) final;

private:

-#if defined(ENABLE_MOJO_RENDERER)

- RendererFactory* GetRendererFactory();

- std::unique_ptr<RendererFactory> renderer_factory_;

-#endif // defined(ENABLE_MOJO_RENDERER)

#if defined(ENABLE_MOJO_CDM)

CdmFactory* GetCdmFactory();