Index: media/mojo/services/mojo_media_client.h |
diff --git a/media/mojo/services/mojo_media_client.h b/media/mojo/services/mojo_media_client.h |
index b6d0db7f552674af9c20fd3f4dd3d09786a0adf6..caf813edbb593eb23d23dc9046c141947930d256 100644 |
--- a/media/mojo/services/mojo_media_client.h |
+++ b/media/mojo/services/mojo_media_client.h |
@@ -24,10 +24,12 @@ class InterfaceProvider; |
namespace media { |
class AudioDecoder; |
+class AudioRendererSink; |
class CdmFactory; |
class MediaLog; |
-class Renderer; |
+class RendererFactory; |
class VideoDecoder; |
+class VideoRendererSink; |
class MEDIA_MOJO_EXPORT MojoMediaClient { |
public: |
@@ -47,15 +49,20 @@ class MEDIA_MOJO_EXPORT MojoMediaClient { |
virtual std::unique_ptr<VideoDecoder> CreateVideoDecoder( |
scoped_refptr<base::SingleThreadTaskRunner> task_runner); |
- // TODO(xhwang): Consider creating CDM directly in the client |
- // instead of creating factories. See http://crbug.com/586211 |
- |
- // Creates and returns a Renderer. |
- virtual std::unique_ptr<Renderer> CreateRenderer( |
- scoped_refptr<base::SingleThreadTaskRunner> media_task_runner, |
- scoped_refptr<MediaLog> media_log, |
+ // Returns the output sink used for rendering audio on |audio_device_id|. |
+ // May be null if the RendererFactory doesn't need an audio sink. |
+ virtual scoped_refptr<AudioRendererSink> CreateAudioRendererSink( |
const std::string& audio_device_id); |
+ // Returns the output sink used for rendering video. |
+ // May be null if the RendererFactory doesn't need a video sink. |
+ virtual std::unique_ptr<VideoRendererSink> CreateVideoRendererSink( |
+ const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); |
+ |
+ // Returns the RendererFactory to be used by MojoRendererService. |
+ virtual std::unique_ptr<RendererFactory> CreateRendererFactory( |
+ const scoped_refptr<MediaLog>& media_log); |
+ |
// Returns the CdmFactory to be used by MojoCdmService. |
virtual std::unique_ptr<CdmFactory> CreateCdmFactory( |
shell::mojom::InterfaceProvider* interface_provider); |