OLD | NEW |
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 Loading... |
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"; |
84 case Pipeline::kStopping: | 86 case Pipeline::kStopping: |
85 return "stopping"; | 87 return "stopping"; |
86 case Pipeline::kStopped: | 88 case Pipeline::kStopped: |
87 return "stopped"; | 89 return "stopped"; |
88 case Pipeline::kError: | 90 case Pipeline::kError: |
89 return "error"; | 91 return "error"; |
90 } | 92 } |
91 NOTREACHED(); | 93 NOTREACHED(); |
92 return NULL; | 94 return NULL; |
93 } | 95 } |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 size_t start, size_t current, size_t end) { | 209 size_t start, size_t current, size_t end) { |
208 scoped_ptr<MediaLogEvent> event( | 210 scoped_ptr<MediaLogEvent> event( |
209 CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED)); | 211 CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED)); |
210 event->params.SetInteger("buffer_start", start); | 212 event->params.SetInteger("buffer_start", start); |
211 event->params.SetInteger("buffer_current", current); | 213 event->params.SetInteger("buffer_current", current); |
212 event->params.SetInteger("buffer_end", end); | 214 event->params.SetInteger("buffer_end", end); |
213 return event.Pass(); | 215 return event.Pass(); |
214 } | 216 } |
215 | 217 |
216 } //namespace media | 218 } //namespace media |
OLD | NEW |