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

Unified Diff: media/test/pipeline_integration_test_base.cc

Issue 2710133003: Replace FFmpegDemuxer thread per element with base::TaskScheduler. (Closed)
Patch Set: Give WeakPtr to URLProtocol. Created 3 years, 10 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/test/pipeline_integration_test_base.cc
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc
index 2c7776f438038f1a591d69cb52860a4b4e6713ab..a7638159307cd2d733d6f0827fcb3148bd8c7734 100644
--- a/media/test/pipeline_integration_test_base.cc
+++ b/media/test/pipeline_integration_test_base.cc
@@ -60,6 +60,7 @@ PipelineIntegrationTestBase::~PipelineIntegrationTestBase() {
if (pipeline_->IsRunning())
Stop();
+ demuxer_.reset();
pipeline_.reset();
base::RunLoop().RunUntilIdle();
}
@@ -311,6 +312,7 @@ void PipelineIntegrationTestBase::CreateDemuxer(
data_source_ = std::move(data_source);
#if !defined(MEDIA_DISABLE_FFMPEG)
+ task_scheduler_.reset(new base::test::ScopedTaskScheduler(&message_loop_));
demuxer_ = std::unique_ptr<Demuxer>(new FFmpegDemuxer(
message_loop_.task_runner(), data_source_.get(),
base::Bind(&PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB,
« media/filters/ffmpeg_demuxer.cc ('K') | « media/test/pipeline_integration_test_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698