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

Unified Diff: media/filters/video_renderer_base.h

Issue 12335105: Merge 184048 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 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
« no previous file with comments | « no previous file | 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
===================================================================
--- media/filters/video_renderer_base.h (revision 184723)
+++ media/filters/video_renderer_base.h (working copy)
@@ -194,6 +194,8 @@
// [kUninitialized] -------> [kError]
// |
// | Initialize()
+ // [kInitializing]
+ // |
// V All frames returned
// +------[kFlushed]<-----[kFlushing]<--- OnDecoderResetDone()
// | | Preroll() or upon ^
@@ -216,6 +218,7 @@
// Simple state tracking variable.
enum State {
kUninitialized,
+ kInitializing,
kPrerolled,
kPaused,
kFlushingDecoder,
« no previous file with comments | « no previous file | media/filters/video_renderer_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698