Rewrite media::Pipeline state transition machinery and simplify shutdown.

Shutdown is now a single call to Stop() and is called regardless of the current state of pending operations.

BUG=110228

Review URL: https://chromiumcodereview.appspot.com/10837206

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156011 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 34 deletions

diff --git a/media/base/media_log.cc b/media/base/media_log.cc
index e47286d..cadf291 100644
--- a/media/base/media_log.cc
+++ b/media/base/media_log.cc
@@ -59,37 +59,6 @@ const char* MediaLog::EventTypeToString(MediaLogEvent::Type type) {
   return NULL;
 }
 
-const char* MediaLog::PipelineStateToString(Pipeline::State state) {
-  switch (state) {
-    case Pipeline::kCreated:
-      return "created";
-    case Pipeline::kInitDemuxer:
-      return "initDemuxer";
-    case Pipeline::kInitAudioDecoder:
-      return "initAudioDecoder";
-    case Pipeline::kInitAudioRenderer:
-      return "initAudioRenderer";
-    case Pipeline::kInitVideoRenderer:
-      return "initVideoRenderer";
-    case Pipeline::kPausing:
-      return "pausing";
-    case Pipeline::kSeeking:
-      return "seeking";
-    case Pipeline::kFlushing:
-      return "flushing";
-    case Pipeline::kStarting:
-      return "starting";
-    case Pipeline::kStarted:
-      return "started";
-    case Pipeline::kStopping:
-      return "stopping";
-    case Pipeline::kStopped:
-      return "stopped";
-  }
-  NOTREACHED();
-  return NULL;
-}
-
 const char* MediaLog::PipelineStatusToString(PipelineStatus status) {
   switch (status) {
     case PIPELINE_OK:
@@ -106,8 +75,6 @@ const char* MediaLog::PipelineStatusToString(PipelineStatus status) {
       return "pipeline: abort";
     case PIPELINE_ERROR_INITIALIZATION_FAILED:
       return "pipeline: initialization failed";
-    case PIPELINE_ERROR_REQUIRED_FILTER_MISSING:
-      return "pipeline: required filter missing";
     case PIPELINE_ERROR_COULD_NOT_RENDER:
       return "pipeline: could not render";
     case PIPELINE_ERROR_READ:
@@ -182,7 +149,7 @@ scoped_ptr<MediaLogEvent> MediaLog::CreatePipelineStateChangedEvent(
     Pipeline::State state) {
   scoped_ptr<MediaLogEvent> event(
       CreateEvent(MediaLogEvent::PIPELINE_STATE_CHANGED));
-  event->params.SetString("pipeline_state", PipelineStateToString(state));
+  event->params.SetString("pipeline_state", Pipeline::GetStateString(state));
   return event.Pass();
 }