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

Unified Diff: media/test/pipeline_integration_test_base.h

Issue 2710133003: Replace FFmpegDemuxer thread per element with base::TaskScheduler. (Closed)
Patch Set: Comments. Fix flaky test. 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.h
diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h
index 192d6f837220cf5b1af795ced11046934d4383e0..4580e8a19a2cc60ab85fbb2aa62124ca9ee51938 100644
--- a/media/test/pipeline_integration_test_base.h
+++ b/media/test/pipeline_integration_test_base.h
@@ -11,6 +11,7 @@
#include "base/md5.h"
#include "base/memory/scoped_vector.h"
#include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_scheduler.h"
#include "media/audio/clockless_audio_sink.h"
#include "media/audio/null_audio_sink.h"
#include "media/base/demuxer.h"
@@ -133,6 +134,7 @@ class PipelineIntegrationTestBase : public Pipeline::Client {
base::MD5Context md5_context_;
bool hashing_enabled_;
bool clockless_playback_;
+ std::unique_ptr<base::test::ScopedTaskScheduler> task_scheduler_;
gab 2017/02/24 01:09:06 Why does it have to be delay initialized?
DaleCurtis 2017/02/24 23:40:29 It's only needed for FFmpegDemuxer; which half of
gab 2017/02/26 18:01:35 I see, add a comment to that effect on this member
DaleCurtis 2017/02/27 21:26:30 Done.
std::unique_ptr<Demuxer> demuxer_;
std::unique_ptr<DataSource> data_source_;
std::unique_ptr<PipelineImpl> pipeline_;

Powered by Google App Engine
This is Rietveld 408576698