| OLD | NEW |
| 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 "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "media/base/audio_renderer.h" | 8 #include "media/base/audio_renderer.h" |
| 9 #include "media/base/demuxer.h" | 9 #include "media/base/demuxer.h" |
| 10 #include "media/base/video_decoder.h" | |
| 11 #include "media/base/video_renderer.h" | 10 #include "media/base/video_renderer.h" |
| 12 | 11 |
| 13 namespace media { | 12 namespace media { |
| 14 | 13 |
| 15 FilterCollection::FilterCollection() {} | 14 FilterCollection::FilterCollection() {} |
| 16 | 15 |
| 17 FilterCollection::~FilterCollection() {} | 16 FilterCollection::~FilterCollection() {} |
| 18 | 17 |
| 19 void FilterCollection::SetDemuxer(const scoped_refptr<Demuxer>& demuxer) { | 18 void FilterCollection::SetDemuxer(const scoped_refptr<Demuxer>& demuxer) { |
| 20 demuxer_ = demuxer; | 19 demuxer_ = demuxer; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 35 | 34 |
| 36 void FilterCollection::SetVideoRenderer( | 35 void FilterCollection::SetVideoRenderer( |
| 37 scoped_ptr<VideoRenderer> video_renderer) { | 36 scoped_ptr<VideoRenderer> video_renderer) { |
| 38 video_renderer_ = video_renderer.Pass(); | 37 video_renderer_ = video_renderer.Pass(); |
| 39 } | 38 } |
| 40 | 39 |
| 41 scoped_ptr<VideoRenderer> FilterCollection::GetVideoRenderer() { | 40 scoped_ptr<VideoRenderer> FilterCollection::GetVideoRenderer() { |
| 42 return video_renderer_.Pass(); | 41 return video_renderer_.Pass(); |
| 43 } | 42 } |
| 44 | 43 |
| 45 FilterCollection::VideoDecoderList* FilterCollection::GetVideoDecoders() { | |
| 46 return &video_decoders_; | |
| 47 } | |
| 48 | |
| 49 } // namespace media | 44 } // namespace media |
| OLD | NEW |