Chromium Code Reviews| Index: media/base/filter_collection.h |
| diff --git a/media/base/filter_collection.h b/media/base/filter_collection.h |
| index a0aee76f0b8f92d1eb8268c9aa2ddb608f81f76c..67407739ce6683469e8b073be71eef07f81144b3 100644 |
| --- a/media/base/filter_collection.h |
| +++ b/media/base/filter_collection.h |
| @@ -10,13 +10,12 @@ |
| namespace media { |
| -class AudioRenderer; |
| class Demuxer; |
| +class Renderer; |
| class TextRenderer; |
| -class VideoRenderer; |
| // Represents a set of uninitialized demuxer and audio/video decoders and |
|
scherkus (not reviewing)
2014/08/22 20:50:01
I guess there aren't even decoders ... this whole
xhwang
2014/08/22 22:48:22
Done.
|
| -// renderers. Used to start a Pipeline object for media playback. |
| +// renderer. Used to start a Pipeline object for media playback. |
| // |
| // TODO(scherkus): Replace FilterCollection with something sensible, see |
| // http://crbug.com/110800 |
| @@ -28,19 +27,15 @@ class MEDIA_EXPORT FilterCollection { |
| void SetDemuxer(Demuxer* demuxer); |
| Demuxer* GetDemuxer(); |
| - void SetAudioRenderer(scoped_ptr<AudioRenderer> audio_renderer); |
| - scoped_ptr<AudioRenderer> GetAudioRenderer(); |
| - |
| - void SetVideoRenderer(scoped_ptr<VideoRenderer> video_renderer); |
| - scoped_ptr<VideoRenderer> GetVideoRenderer(); |
| + void SetRenderer(scoped_ptr<Renderer> renderer); |
| + scoped_ptr<Renderer> GetRenderer(); |
| void SetTextRenderer(scoped_ptr<TextRenderer> text_renderer); |
| scoped_ptr<TextRenderer> GetTextRenderer(); |
|
scherkus (not reviewing)
2014/08/22 20:50:01
considering TextRenderer is concrete, we should co
xhwang
2014/08/22 22:48:22
Modified TODO to reflect this. Will do after this
|
| private: |
| Demuxer* demuxer_; |
| - scoped_ptr<AudioRenderer> audio_renderer_; |
| - scoped_ptr<VideoRenderer> video_renderer_; |
| + scoped_ptr<Renderer> renderer_; |
| scoped_ptr<TextRenderer> text_renderer_; |
| DISALLOW_COPY_AND_ASSIGN(FilterCollection); |