| 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 "base/atomic_sequence_num.h" | 7 #include "base/atomic_sequence_num.h" |
| 8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 | 10 |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 void MediaLog::SetTimeProperty( | 264 void MediaLog::SetTimeProperty( |
| 265 const std::string& key, base::TimeDelta value) { | 265 const std::string& key, base::TimeDelta value) { |
| 266 scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE)); | 266 scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE)); |
| 267 if (value.is_max()) | 267 if (value.is_max()) |
| 268 event->params.SetString(key, "unknown"); | 268 event->params.SetString(key, "unknown"); |
| 269 else | 269 else |
| 270 event->params.SetDouble(key, value.InSecondsF()); | 270 event->params.SetDouble(key, value.InSecondsF()); |
| 271 AddEvent(event.Pass()); | 271 AddEvent(event.Pass()); |
| 272 } | 272 } |
| 273 | 273 |
| 274 LogHelper::LogHelper(MediaLog::MediaLogLevel level, const LogCB& log_cb) | |
| 275 : level_(level), log_cb_(log_cb) { | |
| 276 } | |
| 277 | |
| 278 LogHelper::LogHelper(MediaLog::MediaLogLevel level, | 274 LogHelper::LogHelper(MediaLog::MediaLogLevel level, |
| 279 const scoped_refptr<MediaLog>& media_log) | 275 const scoped_refptr<MediaLog>& media_log) |
| 280 : level_(level), media_log_(media_log) { | 276 : level_(level), media_log_(media_log) { |
| 281 } | 277 } |
| 282 | 278 |
| 283 LogHelper::~LogHelper() { | 279 LogHelper::~LogHelper() { |
| 284 if (!log_cb_.is_null()) | 280 if (media_log_) |
| 285 log_cb_.Run(level_, stream_.str()); | |
| 286 else if (media_log_) | |
| 287 media_log_->AddLogEvent(level_, stream_.str()); | 281 media_log_->AddLogEvent(level_, stream_.str()); |
| 288 } | 282 } |
| 289 | 283 |
| 290 } //namespace media | 284 } //namespace media |
| OLD | NEW |