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

Unified Diff: media/base/media_log.cc

Issue 10837206: Rewrite media::Pipeline state transition machinery and simplify shutdown. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 8 years, 3 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/base/pipeline.h » ('j') | media/base/pipeline.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_log.cc
diff --git a/media/base/media_log.cc b/media/base/media_log.cc
index e47286d002212e846e2cf432faa1192c2bc5ce1e..a44883b204de91840ff52293c9e2f70a2549bd76 100644
--- a/media/base/media_log.cc
+++ b/media/base/media_log.cc
@@ -71,12 +71,10 @@ const char* MediaLog::PipelineStateToString(Pipeline::State state) {
return "initAudioRenderer";
case Pipeline::kInitVideoRenderer:
return "initVideoRenderer";
- case Pipeline::kPausing:
- return "pausing";
+ case Pipeline::kInitPrerolling:
acolwell GONE FROM CHROMIUM 2012/09/06 09:19:10 Any reason to not reuse Pipeline::GetStateString()
scherkus (not reviewing) 2012/09/06 15:33:20 !!!!!!!!! I can't believe I never thought of this
+ return "initPrerolling";
case Pipeline::kSeeking:
return "seeking";
- case Pipeline::kFlushing:
- return "flushing";
case Pipeline::kStarting:
return "starting";
case Pipeline::kStarted:
« no previous file with comments | « no previous file | media/base/pipeline.h » ('j') | media/base/pipeline.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698