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

Unified Diff: media/filters/ffmpeg_video_decoder.h

Issue 148423005: Use FF_THREAD_SLICE threading mode in FFmpeg for MediaSource streams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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_video_decoder.h
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index 07cf2be2475eca53e6b2add3fdbaa8b4574a1731..014c206d173517fccb48c35c514e7549c5549ab1 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -29,8 +29,21 @@ class ScopedPtrAVFreeFrame;
class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
public:
- explicit FFmpegVideoDecoder(
- const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
+ // Threading mode determines how frames should be distributed between
+ // decoding threads.
+ enum ThreadingMode {
+ // Each thread decode a single frame and multiple frames may be decoded in
Ami GONE FROM CHROMIUM 2014/01/28 07:17:10 s/decode/decodes/
+ // parallel. In this mode FFmpeg will delay N-1 frames when using N threads.
+ THREADING_FRAME,
+
+ // Each frame is distributed between decode threads. If the video contains
+ // only one slice per frame then only one thread will be used for decoding.
+ THREADING_SLICE,
+ };
+
+ FFmpegVideoDecoder(
+ const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
+ ThreadingMode threading_mode);
virtual ~FFmpegVideoDecoder();
// VideoDecoder implementation.
@@ -72,6 +85,8 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
void DoReset();
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+ ThreadingMode threading_mode_;
+
base::WeakPtrFactory<FFmpegVideoDecoder> weak_factory_;
base::WeakPtr<FFmpegVideoDecoder> weak_this_;

Powered by Google App Engine
This is Rietveld 408576698