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) {

[acolwell GONE FROM CHROMIUM, 2012/09/05 13:22:22]

Remove and call Pipeline::GetStateString() instead

   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::kInitPrerolling:
+      return "initPrerolling";
     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();
@@ skipping 115 matching lines @@
     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