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

Unified Diff: media/mojo/services/test_mojo_media_client.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/service_factory_impl.cc ('k') | media/mojo/services/test_mojo_media_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/test_mojo_media_client.h
diff --git a/media/mojo/services/test_mojo_media_client.h b/media/mojo/services/test_mojo_media_client.h
index 904616752ff05e3cf40b8c7c0580adbe67fe9c5b..7d9a1427615b43cc893d7055c174895dd9945c7a 100644
--- a/media/mojo/services/test_mojo_media_client.h
+++ b/media/mojo/services/test_mojo_media_client.h
@@ -12,10 +12,16 @@
#include "media/audio/audio_manager.h"
#include "media/mojo/services/mojo_media_client.h"
+namespace base {
+class SingleThreadTaskRunner;
+}
+
namespace media {
class AudioHardwareConfig;
class AudioRendererSink;
+class MediaLog;
+class RendererFactory;
class VideoRendererSink;
// Default MojoMediaClient for MojoMediaApplication.
@@ -27,16 +33,21 @@ class TestMojoMediaClient : public MojoMediaClient {
// MojoMediaClient implementation.
void Initialize() final;
void WillQuit() final;
- std::unique_ptr<RendererFactory> CreateRendererFactory(
- const scoped_refptr<MediaLog>& media_log) final;
- AudioRendererSink* CreateAudioRendererSink() final;
- VideoRendererSink* CreateVideoRendererSink(
- const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) final;
+ std::unique_ptr<Renderer> CreateRenderer(
+ scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
+ scoped_refptr<MediaLog> media_log,
+ const std::string& audio_device_id) final;
std::unique_ptr<CdmFactory> CreateCdmFactory(
shell::mojom::InterfaceProvider* /* interface_provider */) final;
private:
+ RendererFactory* GetRendererFactory(scoped_refptr<MediaLog> media_log);
+ AudioRendererSink* GetAudioRendererSink();
+ VideoRendererSink* GetVideoRendererSink(
+ const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
+
ScopedAudioManagerPtr audio_manager_;
+ std::unique_ptr<RendererFactory> renderer_factory_;
scoped_refptr<AudioRendererSink> audio_renderer_sink_;
std::unique_ptr<VideoRendererSink> video_renderer_sink_;
« no previous file with comments | « media/mojo/services/service_factory_impl.cc ('k') | media/mojo/services/test_mojo_media_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698