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

Unified Diff: media/filters/ffmpeg_demuxer.h

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/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index a5b15bc6d9618095c4be3a8507136b927babc519..4c06c4c97e6115ca3f1364a64bb8d998f12b1b8e 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -32,7 +32,9 @@
#include "base/callback.h"
#include "base/macros.h"
-#include "base/threading/thread.h"
+#include "base/memory/weak_ptr.h"
+#include "base/sequenced_task_runner.h"
+#include "base/single_thread_task_runner.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decoder_buffer_queue.h"
@@ -295,8 +297,12 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
- // Thread on which all blocking FFmpeg operations are executed.
- base::Thread blocking_thread_;
+ // Task runner on which all blocking FFmpeg operations are executed; retrieved
+ // from base::TaskScheduler.
+ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
+
+ // Indicates if Stop() has been called.
+ bool stopped_;
// Tracks if there's an outstanding av_read_frame() operation.
//

Powered by Google App Engine
This is Rietveld 408576698