| 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 case PIPELINE_ERROR_INVALID_STATE: | 90 case PIPELINE_ERROR_INVALID_STATE: |
| 91 return "pipeline: invalid state"; | 91 return "pipeline: invalid state"; |
| 92 case DEMUXER_ERROR_COULD_NOT_OPEN: | 92 case DEMUXER_ERROR_COULD_NOT_OPEN: |
| 93 return "demuxer: could not open"; | 93 return "demuxer: could not open"; |
| 94 case DEMUXER_ERROR_COULD_NOT_PARSE: | 94 case DEMUXER_ERROR_COULD_NOT_PARSE: |
| 95 return "dumuxer: could not parse"; | 95 return "dumuxer: could not parse"; |
| 96 case DEMUXER_ERROR_NO_SUPPORTED_STREAMS: | 96 case DEMUXER_ERROR_NO_SUPPORTED_STREAMS: |
| 97 return "demuxer: no supported streams"; | 97 return "demuxer: no supported streams"; |
| 98 case DECODER_ERROR_NOT_SUPPORTED: | 98 case DECODER_ERROR_NOT_SUPPORTED: |
| 99 return "decoder: not supported"; | 99 return "decoder: not supported"; |
| 100 case PIPELINE_STATUS_MAX: | |
| 101 NOTREACHED(); | |
| 102 } | 100 } |
| 103 NOTREACHED(); | 101 NOTREACHED(); |
| 104 return NULL; | 102 return NULL; |
| 105 } | 103 } |
| 106 | 104 |
| 107 LogHelper::LogHelper(const LogCB& log_cb) : log_cb_(log_cb) {} | 105 LogHelper::LogHelper(const LogCB& log_cb) : log_cb_(log_cb) {} |
| 108 | 106 |
| 109 LogHelper::~LogHelper() { | 107 LogHelper::~LogHelper() { |
| 110 if (log_cb_.is_null()) | 108 if (log_cb_.is_null()) |
| 111 return; | 109 return; |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 } | 222 } |
| 225 | 223 |
| 226 void MediaLog::SetBooleanProperty( | 224 void MediaLog::SetBooleanProperty( |
| 227 const char* key, bool value) { | 225 const char* key, bool value) { |
| 228 scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE)); | 226 scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE)); |
| 229 event->params.SetBoolean(key, value); | 227 event->params.SetBoolean(key, value); |
| 230 AddEvent(event.Pass()); | 228 AddEvent(event.Pass()); |
| 231 } | 229 } |
| 232 | 230 |
| 233 } //namespace media | 231 } //namespace media |
| OLD | NEW |