Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side 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: Minor change based on the comment Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « media/mojo/services/mojo_media_client.cc ('k') | media/mojo/services/service_factory_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ 5 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
6 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ 6 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 21 matching lines...) Expand all
32 ServiceFactoryImpl(mojo::InterfaceRequest<mojom::ServiceFactory> request, 32 ServiceFactoryImpl(mojo::InterfaceRequest<mojom::ServiceFactory> request,
33 shell::mojom::InterfaceProvider* interfaces, 33 shell::mojom::InterfaceProvider* interfaces,
34 scoped_refptr<MediaLog> media_log, 34 scoped_refptr<MediaLog> media_log,
35 std::unique_ptr<shell::ServiceContextRef> connection_ref, 35 std::unique_ptr<shell::ServiceContextRef> connection_ref,
36 MojoMediaClient* mojo_media_client); 36 MojoMediaClient* mojo_media_client);
37 ~ServiceFactoryImpl() final; 37 ~ServiceFactoryImpl() final;
38 38
39 // mojom::ServiceFactory implementation. 39 // mojom::ServiceFactory implementation.
40 void CreateAudioDecoder(mojom::AudioDecoderRequest request) final; 40 void CreateAudioDecoder(mojom::AudioDecoderRequest request) final;
41 void CreateVideoDecoder(mojom::VideoDecoderRequest request) final; 41 void CreateVideoDecoder(mojom::VideoDecoderRequest request) final;
42 void CreateRenderer(mojom::RendererRequest request) final; 42 void CreateRenderer(const mojo::String& audio_device_id,
43 mojom::RendererRequest request) final;
43 void CreateCdm(mojom::ContentDecryptionModuleRequest request) final; 44 void CreateCdm(mojom::ContentDecryptionModuleRequest request) final;
44 45
45 private: 46 private:
46 #if defined(ENABLE_MOJO_RENDERER)
47 RendererFactory* GetRendererFactory();
48
49 std::unique_ptr<RendererFactory> renderer_factory_;
50 #endif // defined(ENABLE_MOJO_RENDERER)
51
52 #if defined(ENABLE_MOJO_CDM) 47 #if defined(ENABLE_MOJO_CDM)
53 CdmFactory* GetCdmFactory(); 48 CdmFactory* GetCdmFactory();
54 49
55 std::unique_ptr<CdmFactory> cdm_factory_; 50 std::unique_ptr<CdmFactory> cdm_factory_;
56 #endif // defined(ENABLE_MOJO_CDM) 51 #endif // defined(ENABLE_MOJO_CDM)
57 52
58 MojoCdmServiceContext cdm_service_context_; 53 MojoCdmServiceContext cdm_service_context_;
59 mojo::StrongBinding<mojom::ServiceFactory> binding_; 54 mojo::StrongBinding<mojom::ServiceFactory> binding_;
60 #if defined(ENABLE_MOJO_CDM) 55 #if defined(ENABLE_MOJO_CDM)
61 shell::mojom::InterfaceProvider* interfaces_; 56 shell::mojom::InterfaceProvider* interfaces_;
62 #endif 57 #endif
63 58
64 scoped_refptr<MediaLog> media_log_; 59 scoped_refptr<MediaLog> media_log_;
65 std::unique_ptr<shell::ServiceContextRef> connection_ref_; 60 std::unique_ptr<shell::ServiceContextRef> connection_ref_;
66 MojoMediaClient* mojo_media_client_; 61 MojoMediaClient* mojo_media_client_;
67 62
68 DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl); 63 DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl);
69 }; 64 };
70 65
71 } // namespace media 66 } // namespace media
72 67
73 #endif // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ 68 #endif // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_media_client.cc ('k') | media/mojo/services/service_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698