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

Side by Side Diff: media/base/media_log.cc

Issue 10828045: Rewrite media::Pipeline state transition machinery. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: stuff Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | media/base/mock_filters.h » ('j') | media/base/pipeline.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/media_log.h" 5 #include "media/base/media_log.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 case Pipeline::kPausing: 74 case Pipeline::kPausing:
75 return "pausing"; 75 return "pausing";
76 case Pipeline::kSeeking: 76 case Pipeline::kSeeking:
77 return "seeking"; 77 return "seeking";
78 case Pipeline::kFlushing: 78 case Pipeline::kFlushing:
79 return "flushing"; 79 return "flushing";
80 case Pipeline::kStarting: 80 case Pipeline::kStarting:
81 return "starting"; 81 return "starting";
82 case Pipeline::kStarted: 82 case Pipeline::kStarted:
83 return "started"; 83 return "started";
84 case Pipeline::kEnded:
85 return "ended";
86 case Pipeline::kStopping: 84 case Pipeline::kStopping:
87 return "stopping"; 85 return "stopping";
88 case Pipeline::kStopped: 86 case Pipeline::kStopped:
89 return "stopped"; 87 return "stopped";
90 case Pipeline::kError:
91 return "error";
92 } 88 }
93 NOTREACHED(); 89 NOTREACHED();
94 return NULL; 90 return NULL;
95 } 91 }
96 92
97 const char* MediaLog::PipelineStatusToString(PipelineStatus status) { 93 const char* MediaLog::PipelineStatusToString(PipelineStatus status) {
98 switch (status) { 94 switch (status) {
99 case PIPELINE_OK: 95 case PIPELINE_OK:
100 return "pipeline: ok"; 96 return "pipeline: ok";
101 case PIPELINE_ERROR_URL_NOT_FOUND: 97 case PIPELINE_ERROR_URL_NOT_FOUND:
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 size_t start, size_t current, size_t end) { 205 size_t start, size_t current, size_t end) {
210 scoped_ptr<MediaLogEvent> event( 206 scoped_ptr<MediaLogEvent> event(
211 CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED)); 207 CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED));
212 event->params.SetInteger("buffer_start", start); 208 event->params.SetInteger("buffer_start", start);
213 event->params.SetInteger("buffer_current", current); 209 event->params.SetInteger("buffer_current", current);
214 event->params.SetInteger("buffer_end", end); 210 event->params.SetInteger("buffer_end", end);
215 return event.Pass(); 211 return event.Pass();
216 } 212 }
217 213
218 } //namespace media 214 } //namespace media
OLDNEW
« no previous file with comments | « no previous file | media/base/mock_filters.h » ('j') | media/base/pipeline.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698