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

Unified Diff: media/filters/video_renderer_base.h

Issue 10173012: Fix VideoRendererBase to allow the decoder to be flushed with a pending read. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor fixes based on comments. Created 8 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
« no previous file with comments | « media/base/mock_filters.h ('k') | media/filters/video_renderer_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_renderer_base.h
diff --git a/media/filters/video_renderer_base.h b/media/filters/video_renderer_base.h
index ca9ebea0351562b1f741e130deab42d551f07095..2746ccb98da0e155383670477fbed0cbc380a0c2 100644
--- a/media/filters/video_renderer_base.h
+++ b/media/filters/video_renderer_base.h
@@ -81,6 +81,9 @@ class MEDIA_EXPORT VideoRendererBase
// as there isn't a pending read and we have capacity.
void AttemptRead_Locked();
+ // Called when the VideoDecoder Flush() completes.
+ void OnDecoderFlushDone();
+
// Attempts to complete flushing and transition into the flushed state.
void AttemptFlush_Locked();
@@ -133,11 +136,11 @@ class MEDIA_EXPORT VideoRendererBase
// |
// | Initialize()
// V All frames returned
- // +------[kFlushed]<----------------------[kFlushing]
+ // +------[kFlushed]<-----[kFlushing]<--- OnDecoderFlushDone()
// | | Seek() or upon ^
- // | V got first frame |
- // | [kSeeking] | Flush()
- // | | |
+ // | V got first frame [kFlushingDecoder]
+ // | [kSeeking] ^
+ // | | | Flush()
// | V Got enough frames |
// | [kPrerolled]---------------------->[kPaused]
// | | Pause() ^
@@ -156,6 +159,7 @@ class MEDIA_EXPORT VideoRendererBase
kUninitialized,
kPrerolled,
kPaused,
+ kFlushingDecoder,
kFlushing,
kFlushed,
kSeeking,
« no previous file with comments | « media/base/mock_filters.h ('k') | media/filters/video_renderer_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698