| Index: media/base/filter_collection.cc
|
| diff --git a/media/base/filter_collection.cc b/media/base/filter_collection.cc
|
| index f0992026e50d200dac076e112379890750930d8d..c92ecff0c1f95cc8bdb8cc00b888776af4bf97c6 100644
|
| --- a/media/base/filter_collection.cc
|
| +++ b/media/base/filter_collection.cc
|
| @@ -25,10 +25,6 @@ const scoped_refptr<Demuxer>& FilterCollection::GetDemuxer() {
|
| return demuxer_;
|
| }
|
|
|
| -void FilterCollection::AddAudioDecoder(AudioDecoder* audio_decoder) {
|
| - audio_decoders_.push_back(audio_decoder);
|
| -}
|
| -
|
| void FilterCollection::AddAudioRenderer(AudioRenderer* audio_renderer) {
|
| audio_renderers_.push_back(audio_renderer);
|
| }
|
| @@ -44,15 +40,6 @@ void FilterCollection::Clear() {
|
| video_renderers_.clear();
|
| }
|
|
|
| -void FilterCollection::SelectAudioDecoder(scoped_refptr<AudioDecoder>* out) {
|
| - if (audio_decoders_.empty()) {
|
| - *out = NULL;
|
| - return;
|
| - }
|
| - *out = audio_decoders_.front();
|
| - audio_decoders_.pop_front();
|
| -}
|
| -
|
| void FilterCollection::SelectAudioRenderer(scoped_refptr<AudioRenderer>* out) {
|
| if (audio_renderers_.empty()) {
|
| *out = NULL;
|
| @@ -71,6 +58,11 @@ void FilterCollection::SelectVideoRenderer(scoped_refptr<VideoRenderer>* out) {
|
| video_renderers_.pop_front();
|
| }
|
|
|
| +FilterCollection::AudioDecoderList*
|
| +FilterCollection::GetAudioDecoders() {
|
| + return &audio_decoders_;
|
| +}
|
| +
|
| FilterCollection::VideoDecoderList*
|
| FilterCollection::GetVideoDecoders() {
|
| return &video_decoders_;
|
|
|