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

Unified Diff: media/filters/pipeline_integration_test_base.cc

Issue 13813016: Remove reference counting from media::Demuxer and friends. (Closed) Base URL: http://git.chromium.org/chromium/src.git@vd_scoped
Patch Set: demuxer only Created 7 years, 8 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/filters/pipeline_integration_test_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 0be9861ec325782a0025d85874a071673b912d11..c138afb0816d4ca2f5312e41886200be547aee56 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -210,19 +210,19 @@ PipelineIntegrationTestBase::CreateFilterCollection(
media::FFmpegNeedKeyCB need_key_cb =
base::Bind(&PipelineIntegrationTestBase::DemuxerNeedKeyCB,
base::Unretained(this));
- return CreateFilterCollection(
- new FFmpegDemuxer(message_loop_.message_loop_proxy(),
- data_source,
- need_key_cb),
- decryptor);
+ scoped_ptr<Demuxer> demuxer(new FFmpegDemuxer(
+ message_loop_.message_loop_proxy(), data_source, need_key_cb));
+ return CreateFilterCollection(demuxer.Pass(), decryptor);
}
scoped_ptr<FilterCollection>
PipelineIntegrationTestBase::CreateFilterCollection(
- const scoped_refptr<Demuxer>& demuxer,
+ scoped_ptr<Demuxer> demuxer,
Decryptor* decryptor) {
+ demuxer_ = demuxer.Pass();
+
scoped_ptr<FilterCollection> collection(new FilterCollection());
- collection->SetDemuxer(demuxer);
+ collection->SetDemuxer(demuxer_.get());
ScopedVector<VideoDecoder> video_decoders;
video_decoders.push_back(

Powered by Google App Engine
This is Rietveld 408576698