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

Side by Side Diff: media/base/filter_collection.h

Issue 503053007: Revert of media: Introduce Renderer interface and RendererImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « media/base/BUILD.gn ('k') | media/base/filter_collection.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BASE_FILTER_COLLECTION_H_ 5 #ifndef MEDIA_BASE_FILTER_COLLECTION_H_
6 #define MEDIA_BASE_FILTER_COLLECTION_H_ 6 #define MEDIA_BASE_FILTER_COLLECTION_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "media/base/media_export.h" 9 #include "media/base/media_export.h"
10 10
11 namespace media { 11 namespace media {
12 12
13 class AudioRenderer;
13 class Demuxer; 14 class Demuxer;
14 class Renderer;
15 class TextRenderer; 15 class TextRenderer;
16 class VideoRenderer;
16 17
17 // Represents a set of uninitialized demuxer and renderers. Used to start a 18 // Represents a set of uninitialized demuxer and audio/video decoders and
18 // Pipeline object for media playback. 19 // renderers. Used to start a Pipeline object for media playback.
19 // 20 //
20 // TODO(xhwang): Create TextRenderer in Pipeline, pass Demuxer and Renderer to 21 // TODO(scherkus): Replace FilterCollection with something sensible, see
21 // Pipeline, and remove FilterCollection, see http://crbug.com/110800 22 // http://crbug.com/110800
22 class MEDIA_EXPORT FilterCollection { 23 class MEDIA_EXPORT FilterCollection {
23 public: 24 public:
24 FilterCollection(); 25 FilterCollection();
25 ~FilterCollection(); 26 ~FilterCollection();
26 27
27 void SetDemuxer(Demuxer* demuxer); 28 void SetDemuxer(Demuxer* demuxer);
28 Demuxer* GetDemuxer(); 29 Demuxer* GetDemuxer();
29 30
30 void SetRenderer(scoped_ptr<Renderer> renderer); 31 void SetAudioRenderer(scoped_ptr<AudioRenderer> audio_renderer);
31 scoped_ptr<Renderer> GetRenderer(); 32 scoped_ptr<AudioRenderer> GetAudioRenderer();
33
34 void SetVideoRenderer(scoped_ptr<VideoRenderer> video_renderer);
35 scoped_ptr<VideoRenderer> GetVideoRenderer();
32 36
33 void SetTextRenderer(scoped_ptr<TextRenderer> text_renderer); 37 void SetTextRenderer(scoped_ptr<TextRenderer> text_renderer);
34 scoped_ptr<TextRenderer> GetTextRenderer(); 38 scoped_ptr<TextRenderer> GetTextRenderer();
35 39
36 private: 40 private:
37 Demuxer* demuxer_; 41 Demuxer* demuxer_;
38 scoped_ptr<Renderer> renderer_; 42 scoped_ptr<AudioRenderer> audio_renderer_;
43 scoped_ptr<VideoRenderer> video_renderer_;
39 scoped_ptr<TextRenderer> text_renderer_; 44 scoped_ptr<TextRenderer> text_renderer_;
40 45
41 DISALLOW_COPY_AND_ASSIGN(FilterCollection); 46 DISALLOW_COPY_AND_ASSIGN(FilterCollection);
42 }; 47 };
43 48
44 } // namespace media 49 } // namespace media
45 50
46 #endif // MEDIA_BASE_FILTER_COLLECTION_H_ 51 #endif // MEDIA_BASE_FILTER_COLLECTION_H_
OLDNEW
« no previous file with comments | « media/base/BUILD.gn ('k') | media/base/filter_collection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698