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

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

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/filter_collection.h ('k') | media/base/media_log.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 #include "media/base/filter_collection.h" 5 #include "media/base/filter_collection.h"
6 6
7 #include "media/base/audio_renderer.h"
7 #include "media/base/demuxer.h" 8 #include "media/base/demuxer.h"
8 #include "media/base/renderer.h"
9 #include "media/base/text_renderer.h" 9 #include "media/base/text_renderer.h"
10 #include "media/base/video_renderer.h"
10 11
11 namespace media { 12 namespace media {
12 13
13 FilterCollection::FilterCollection() : demuxer_(NULL) {} 14 FilterCollection::FilterCollection() : demuxer_(NULL) {}
14 15
15 FilterCollection::~FilterCollection() {} 16 FilterCollection::~FilterCollection() {}
16 17
17 void FilterCollection::SetDemuxer(Demuxer* demuxer) { 18 void FilterCollection::SetDemuxer(Demuxer* demuxer) {
18 demuxer_ = demuxer; 19 demuxer_ = demuxer;
19 } 20 }
20 21
21 Demuxer* FilterCollection::GetDemuxer() { 22 Demuxer* FilterCollection::GetDemuxer() {
22 return demuxer_; 23 return demuxer_;
23 } 24 }
24 25
25 void FilterCollection::SetRenderer(scoped_ptr<Renderer> renderer) { 26 void FilterCollection::SetAudioRenderer(
26 renderer_ = renderer.Pass(); 27 scoped_ptr<AudioRenderer> audio_renderer) {
28 audio_renderer_ = audio_renderer.Pass();
27 } 29 }
28 30
29 scoped_ptr<Renderer> FilterCollection::GetRenderer() { 31 scoped_ptr<AudioRenderer> FilterCollection::GetAudioRenderer() {
30 return renderer_.Pass(); 32 return audio_renderer_.Pass();
31 } 33 }
32 34
33 void FilterCollection::SetTextRenderer(scoped_ptr<TextRenderer> text_renderer) { 35 void FilterCollection::SetVideoRenderer(
36 scoped_ptr<VideoRenderer> video_renderer) {
37 video_renderer_ = video_renderer.Pass();
38 }
39
40 scoped_ptr<VideoRenderer> FilterCollection::GetVideoRenderer() {
41 return video_renderer_.Pass();
42 }
43
44 void FilterCollection::SetTextRenderer(
45 scoped_ptr<TextRenderer> text_renderer) {
34 text_renderer_ = text_renderer.Pass(); 46 text_renderer_ = text_renderer.Pass();
35 } 47 }
36 48
37 scoped_ptr<TextRenderer> FilterCollection::GetTextRenderer() { 49 scoped_ptr<TextRenderer> FilterCollection::GetTextRenderer() {
38 return text_renderer_.Pass(); 50 return text_renderer_.Pass();
39 } 51 }
40 52
41 } // namespace media 53 } // namespace media
OLDNEW
« no previous file with comments | « media/base/filter_collection.h ('k') | media/base/media_log.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698