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

Unified Diff: media/base/filter_collection.cc

Issue 10836167: Move VideoDecoder initialization into VideoRendererBase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: media/base/filter_collection.cc
diff --git a/media/base/filter_collection.cc b/media/base/filter_collection.cc
index 0b10f5f5c12f7f2b5ff8a6fa12adce99e6b98a6c..cf8a9024ff3b50e5d00dae65b691297aba9832fb 100644
--- a/media/base/filter_collection.cc
+++ b/media/base/filter_collection.cc
@@ -29,10 +29,6 @@ void FilterCollection::AddAudioDecoder(AudioDecoder* audio_decoder) {
audio_decoders_.push_back(audio_decoder);
}
-void FilterCollection::AddVideoDecoder(VideoDecoder* video_decoder) {
- video_decoders_.push_back(video_decoder);
-}
-
void FilterCollection::AddAudioRenderer(AudioRenderer* audio_renderer) {
audio_renderers_.push_back(audio_renderer);
}
@@ -64,15 +60,6 @@ void FilterCollection::SelectAudioDecoder(scoped_refptr<AudioDecoder>* out) {
audio_decoders_.pop_front();
}
-void FilterCollection::SelectVideoDecoder(scoped_refptr<VideoDecoder>* out) {
- if (video_decoders_.empty()) {
- *out = NULL;
- return;
- }
- *out = video_decoders_.front();
- video_decoders_.pop_front();
-}
-
void FilterCollection::SelectAudioRenderer(scoped_refptr<AudioRenderer>* out) {
if (audio_renderers_.empty()) {
*out = NULL;
@@ -91,4 +78,9 @@ void FilterCollection::SelectVideoRenderer(scoped_refptr<VideoRenderer>* out) {
video_renderers_.pop_front();
}
+FilterCollection::VideoDecoderList&
+FilterCollection::GetVideoDecoders() {
+ return video_decoders_;
+}
+
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698