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

Unified Diff: media/base/filter_collection.cc

Issue 6648004: DemuxerFactory is born! (Closed)
Patch Set: Responses to scherkus@ CR Created 9 years, 9 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
« no previous file with comments | « media/base/filter_collection.h ('k') | media/base/filter_factories.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/filter_collection.cc
diff --git a/media/base/filter_collection.cc b/media/base/filter_collection.cc
index 8dcd42d2e23c904ac0e68139dd84c0e38723c821..51b34e355b8accc4cbd06f05e6fc575317265fd9 100644
--- a/media/base/filter_collection.cc
+++ b/media/base/filter_collection.cc
@@ -12,17 +12,13 @@ FilterCollection::FilterCollection() {}
FilterCollection::~FilterCollection() {}
-void FilterCollection::SetDataSourceFactory(DataSourceFactory* factory) {
+void FilterCollection::SetDemuxerFactory(DemuxerFactory* factory) {
DCHECK(factory);
- data_source_factory_.reset(factory);
+ demuxer_factory_.reset(factory);
}
-DataSourceFactory* FilterCollection::GetDataSourceFactory() {
- return data_source_factory_.get();
-}
-
-void FilterCollection::AddDemuxer(Demuxer* filter) {
- AddFilter(DEMUXER, filter);
+DemuxerFactory* FilterCollection::GetDemuxerFactory() {
+ return demuxer_factory_.get();
}
void FilterCollection::AddVideoDecoder(VideoDecoder* filter) {
@@ -49,10 +45,6 @@ void FilterCollection::Clear() {
filters_.clear();
}
-void FilterCollection::SelectDemuxer(scoped_refptr<Demuxer>* filter_out) {
- SelectFilter<DEMUXER>(filter_out);
-}
-
void FilterCollection::SelectVideoDecoder(
scoped_refptr<VideoDecoder>* filter_out) {
SelectFilter<VIDEO_DECODER>(filter_out);
« no previous file with comments | « media/base/filter_collection.h ('k') | media/base/filter_factories.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698