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

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

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: incorporate aaron's comments (10/16) Created 7 years, 2 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
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/audio_renderer.h"
8 #include "media/base/demuxer.h" 8 #include "media/base/demuxer.h"
9 #include "media/base/text_renderer.h"
9 #include "media/base/video_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;
(...skipping 14 matching lines...) Expand all
33 34
34 void FilterCollection::SetVideoRenderer( 35 void FilterCollection::SetVideoRenderer(
35 scoped_ptr<VideoRenderer> video_renderer) { 36 scoped_ptr<VideoRenderer> video_renderer) {
36 video_renderer_ = video_renderer.Pass(); 37 video_renderer_ = video_renderer.Pass();
37 } 38 }
38 39
39 scoped_ptr<VideoRenderer> FilterCollection::GetVideoRenderer() { 40 scoped_ptr<VideoRenderer> FilterCollection::GetVideoRenderer() {
40 return video_renderer_.Pass(); 41 return video_renderer_.Pass();
41 } 42 }
42 43
44 void FilterCollection::SetTextRenderer(
45 scoped_ptr<TextRenderer> text_renderer) {
46 text_renderer_ = text_renderer.Pass();
47 }
48
49 scoped_ptr<TextRenderer> FilterCollection::GetTextRenderer() {
50 return text_renderer_.Pass();
51 }
52
43 } // namespace media 53 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698