| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 case PIPELINE_ERROR_INVALID_STATE: | 130 case PIPELINE_ERROR_INVALID_STATE: |
| 131 return "pipeline: invalid state"; | 131 return "pipeline: invalid state"; |
| 132 case DEMUXER_ERROR_COULD_NOT_OPEN: | 132 case DEMUXER_ERROR_COULD_NOT_OPEN: |
| 133 return "demuxer: could not open"; | 133 return "demuxer: could not open"; |
| 134 case DEMUXER_ERROR_COULD_NOT_PARSE: | 134 case DEMUXER_ERROR_COULD_NOT_PARSE: |
| 135 return "dumuxer: could not parse"; | 135 return "dumuxer: could not parse"; |
| 136 case DEMUXER_ERROR_NO_SUPPORTED_STREAMS: | 136 case DEMUXER_ERROR_NO_SUPPORTED_STREAMS: |
| 137 return "demuxer: no supported streams"; | 137 return "demuxer: no supported streams"; |
| 138 case DEMUXER_ERROR_COULD_NOT_CREATE_THREAD: | 138 case DEMUXER_ERROR_COULD_NOT_CREATE_THREAD: |
| 139 return "demuxer: could not create thread"; | 139 return "demuxer: could not create thread"; |
| 140 case DECODER_ERROR_NOT_SUPPORTED: |
| 141 return "decoder: not supported"; |
| 140 case DATASOURCE_ERROR_URL_NOT_SUPPORTED: | 142 case DATASOURCE_ERROR_URL_NOT_SUPPORTED: |
| 141 return "data source: url not supported"; | 143 return "data source: url not supported"; |
| 142 } | 144 } |
| 143 NOTREACHED(); | 145 NOTREACHED(); |
| 144 return NULL; | 146 return NULL; |
| 145 } | 147 } |
| 146 | 148 |
| 147 MediaLog::MediaLog() { | 149 MediaLog::MediaLog() { |
| 148 id_ = media_log_count.GetNext(); | 150 id_ = media_log_count.GetNext(); |
| 149 stats_update_pending_ = false; | 151 stats_update_pending_ = false; |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 last_statistics_.video_bytes_decoded); | 255 last_statistics_.video_bytes_decoded); |
| 254 event->params.SetInteger("video_frames_decoded", | 256 event->params.SetInteger("video_frames_decoded", |
| 255 last_statistics_.video_frames_decoded); | 257 last_statistics_.video_frames_decoded); |
| 256 event->params.SetInteger("video_frames_dropped", | 258 event->params.SetInteger("video_frames_dropped", |
| 257 last_statistics_.video_frames_dropped); | 259 last_statistics_.video_frames_dropped); |
| 258 AddEvent(event.release()); | 260 AddEvent(event.release()); |
| 259 stats_update_pending_ = false; | 261 stats_update_pending_ = false; |
| 260 } | 262 } |
| 261 | 263 |
| 262 } //namespace media | 264 } //namespace media |
| OLD | NEW |