| Index: media/mojo/services/renderer_config.h
|
| diff --git a/media/mojo/services/renderer_config.h b/media/mojo/services/renderer_config.h
|
| index 409e79c58095af54d3ed5eb753c4943bebf128fc..08b7e0bbc84fcf70deb15285151c1f592d7b6eec 100644
|
| --- a/media/mojo/services/renderer_config.h
|
| +++ b/media/mojo/services/renderer_config.h
|
| @@ -12,6 +12,7 @@
|
| #include "media/base/audio_hardware_config.h"
|
| #include "media/base/audio_renderer_sink.h"
|
| #include "media/base/media_log.h"
|
| +#include "media/base/video_decoder.h"
|
|
|
| namespace media {
|
|
|
| @@ -21,13 +22,17 @@ class PlatformRendererConfig {
|
| public:
|
| virtual ~PlatformRendererConfig() {};
|
|
|
| - // The list of audio decoders for use with the AudioRenderer. Ownership of
|
| - // the decoders is passed to the caller. The methods on each decoder will
|
| - // only be called on |media_task_runner|. |media_log_cb| should be used to
|
| - // log errors or important status information.
|
| + // The list of audio or video decoders for use with the AudioRenderer or
|
| + // VideoRenderer respectively. Ownership of the decoders is passed to the
|
| + // caller. The methods on each decoder will only be called on
|
| + // |media_task_runner|. |media_log_cb| should be used to log errors or
|
| + // important status information.
|
| virtual ScopedVector<AudioDecoder> GetAudioDecoders(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
|
| const LogCB& media_log_cb) = 0;
|
| + virtual ScopedVector<VideoDecoder> GetVideoDecoders(
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
|
| + const LogCB& media_log_cb) = 0;
|
|
|
| // The audio output sink used for rendering audio.
|
| virtual scoped_refptr<AudioRendererSink> GetAudioRendererSink() = 0;
|
| @@ -36,7 +41,6 @@ class PlatformRendererConfig {
|
| // constant for the lifetime of the PlatformRendererConfig.
|
| virtual const AudioHardwareConfig& GetAudioHardwareConfig() = 0;
|
|
|
| - // TODO(dalecurtis): Expose methods for retrieving the video decoders.
|
| };
|
|
|
| class RendererConfig {
|
| @@ -49,6 +53,9 @@ class RendererConfig {
|
| ScopedVector<AudioDecoder> GetAudioDecoders(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
|
| const LogCB& media_log_cb);
|
| + ScopedVector<VideoDecoder> GetVideoDecoders(
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
|
| + const LogCB& media_log_cb);
|
| scoped_refptr<AudioRendererSink> GetAudioRendererSink();
|
| const AudioHardwareConfig& GetAudioHardwareConfig();
|
|
|
|
|