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

media/base/media_log.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/media_log.h"
 
 #include <string>
 
 #include "base/atomic_sequence_num.h"
 #include "base/logging.h"
@@ skipping 41 matching lines @@
       return "VIDEO_ENDED";
     case MediaLogEvent::AUDIO_RENDERER_DISABLED:
       return "AUDIO_RENDERER_DISABLED";
     case MediaLogEvent::BUFFERED_EXTENTS_CHANGED:
       return "BUFFERED_EXTENTS_CHANGED";
   }
   NOTREACHED();
   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:
       return "pipeline: ok";
     case PIPELINE_ERROR_URL_NOT_FOUND:
       return "pipeline: url not found";
     case PIPELINE_ERROR_NETWORK:
       return "pipeline: network error";
     case PIPELINE_ERROR_DECODE:
       return "pipeline: decode error";
     case PIPELINE_ERROR_DECRYPT:
       return "pipeline: decrypt error";
     case PIPELINE_ERROR_ABORT:
       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:
       return "pipeline: read error";
     case PIPELINE_ERROR_OPERATION_PENDING:
       return "pipeline: operation pending";
     case PIPELINE_ERROR_INVALID_STATE:
       return "pipeline: invalid state";
     case DEMUXER_ERROR_COULD_NOT_OPEN:
       return "demuxer: could not open";
@@ skipping 54 matching lines @@
 scoped_ptr<MediaLogEvent> MediaLog::CreateSeekEvent(float seconds) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::SEEK));
   event->params.SetDouble("seek_target", seconds);
   return event.Pass();
 }
 
 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();
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreatePipelineErrorEvent(
     PipelineStatus error) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PIPELINE_ERROR));
   event->params.SetString("pipeline_error", PipelineStatusToString(error));
   return event.Pass();
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateVideoSizeSetEvent(
     size_t width, size_t height) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::VIDEO_SIZE_SET));
   event->params.SetInteger("width", width);
   event->params.SetInteger("height", height);
   return event.Pass();
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateBufferedExtentsChangedEvent(
     size_t start, size_t current, size_t end) {
   scoped_ptr<MediaLogEvent> event(
       CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED));
   event->params.SetInteger("buffer_start", start);
   event->params.SetInteger("buffer_current", current);
   event->params.SetInteger("buffer_end", end);
   return event.Pass();
 }
 
 }  //namespace media