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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/filter_collection.cc

Issue 9860027: Remove DemuxerFactory and URL parameter from Pipeline. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: added some todos Created 8 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
« media/base/filter_collection.h ('K') | « media/base/filter_collection.h ('k') | media/base/mock_filters.h » ('j') | media/filters/chunk_demuxer.cc » ('J')
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 317139954ac9f28ac2c339a11dd5e1e6561da765..c25cc77000de5d2a8ab23be93e020f03b47cf189 100644
--- a/media/base/filter_collection.cc
+++ b/media/base/filter_collection.cc
@@ -13,13 +13,12 @@ FilterCollection::FilterCollection() {}
FilterCollection::~FilterCollection() {}
-void FilterCollection::SetDemuxerFactory(scoped_ptr<DemuxerFactory> factory) {
- DCHECK(factory.get());
- demuxer_factory_ = factory.Pass();
+void FilterCollection::SetDemuxer(Demuxer* demuxer) {
+ demuxer_ = demuxer;
}
-DemuxerFactory* FilterCollection::GetDemuxerFactory() {
- return demuxer_factory_.get();
+Demuxer* FilterCollection::GetDemuxer() {
+ return demuxer_;
}
void FilterCollection::AddAudioDecoder(AudioDecoder* audio_decoder) {
« media/base/filter_collection.h ('K') | « media/base/filter_collection.h ('k') | media/base/mock_filters.h » ('j') | media/filters/chunk_demuxer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698