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

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

Issue 10836167: Move VideoDecoder initialization into VideoRendererBase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 const char* MediaLog::PipelineStateToString(Pipeline::State state) { 62 const char* MediaLog::PipelineStateToString(Pipeline::State state) {
63 switch (state) { 63 switch (state) {
64 case Pipeline::kCreated: 64 case Pipeline::kCreated:
65 return "created"; 65 return "created";
66 case Pipeline::kInitDemuxer: 66 case Pipeline::kInitDemuxer:
67 return "initDemuxer"; 67 return "initDemuxer";
68 case Pipeline::kInitAudioDecoder: 68 case Pipeline::kInitAudioDecoder:
69 return "initAudioDecoder"; 69 return "initAudioDecoder";
70 case Pipeline::kInitAudioRenderer: 70 case Pipeline::kInitAudioRenderer:
71 return "initAudioRenderer"; 71 return "initAudioRenderer";
72 case Pipeline::kInitVideoDecoder:
73 return "initVideoDecoder";
74 case Pipeline::kInitVideoRenderer: 72 case Pipeline::kInitVideoRenderer:
75 return "initVideoRenderer"; 73 return "initVideoRenderer";
76 case Pipeline::kPausing: 74 case Pipeline::kPausing:
77 return "pausing"; 75 return "pausing";
78 case Pipeline::kSeeking: 76 case Pipeline::kSeeking:
79 return "seeking"; 77 return "seeking";
80 case Pipeline::kFlushing: 78 case Pipeline::kFlushing:
81 return "flushing"; 79 return "flushing";
82 case Pipeline::kStarting: 80 case Pipeline::kStarting:
83 return "starting"; 81 return "starting";
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 size_t start, size_t current, size_t end) { 205 size_t start, size_t current, size_t end) {
208 scoped_ptr<MediaLogEvent> event( 206 scoped_ptr<MediaLogEvent> event(
209 CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED)); 207 CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED));
210 event->params.SetInteger("buffer_start", start); 208 event->params.SetInteger("buffer_start", start);
211 event->params.SetInteger("buffer_current", current); 209 event->params.SetInteger("buffer_current", current);
212 event->params.SetInteger("buffer_end", end); 210 event->params.SetInteger("buffer_end", end);
213 return event.Pass(); 211 return event.Pass();
214 } 212 }
215 213
216 } //namespace media 214 } //namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698