summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/base/media_log.cc6
-rw-r--r--media/base/media_log.h4
-rw-r--r--media/base/pipeline.cc6
3 files changed, 9 insertions, 7 deletions
diff --git a/media/base/media_log.cc b/media/base/media_log.cc
index 509de03..e47286d 100644
--- a/media/base/media_log.cc
+++ b/media/base/media_log.cc
@@ -152,10 +152,10 @@ scoped_ptr<MediaLogEvent> MediaLog::CreateBooleanEvent(
return event.Pass();
}
-scoped_ptr<MediaLogEvent> MediaLog::CreateIntegerEvent(
- MediaLogEvent::Type type, const char* property, int64 value) {
+scoped_ptr<MediaLogEvent> MediaLog::CreateStringEvent(
+ MediaLogEvent::Type type, const char* property, const std::string& value) {
scoped_ptr<MediaLogEvent> event(CreateEvent(type));
- event->params.SetInteger(property, value);
+ event->params.SetString(property, value);
return event.Pass();
}
diff --git a/media/base/media_log.h b/media/base/media_log.h
index 0e93c6b..e72c08e 100644
--- a/media/base/media_log.h
+++ b/media/base/media_log.h
@@ -31,8 +31,8 @@ class MEDIA_EXPORT MediaLog : public base::RefCountedThreadSafe<MediaLog> {
scoped_ptr<MediaLogEvent> CreateEvent(MediaLogEvent::Type type);
scoped_ptr<MediaLogEvent> CreateBooleanEvent(
MediaLogEvent::Type type, const char* property, bool value);
- scoped_ptr<MediaLogEvent> CreateIntegerEvent(
- MediaLogEvent::Type type, const char* property, int64 value);
+ scoped_ptr<MediaLogEvent> CreateStringEvent(
+ MediaLogEvent::Type type, const char* property, const std::string& value);
scoped_ptr<MediaLogEvent> CreateTimeEvent(
MediaLogEvent::Type type, const char* property, base::TimeDelta value);
scoped_ptr<MediaLogEvent> CreateLoadEvent(const std::string& url);
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
index 55f8a40..8e92570 100644
--- a/media/base/pipeline.cc
+++ b/media/base/pipeline.cc
@@ -13,6 +13,7 @@
#include "base/metrics/histogram.h"
#include "base/message_loop.h"
#include "base/stl_util.h"
+#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/synchronization/condition_variable.h"
#include "media/base/audio_decoder.h"
@@ -390,8 +391,9 @@ void Pipeline::SetDuration(TimeDelta duration) {
void Pipeline::SetTotalBytes(int64 total_bytes) {
DCHECK(IsRunning());
media_log_->AddEvent(
- media_log_->CreateIntegerEvent(
- MediaLogEvent::TOTAL_BYTES_SET, "total_bytes", total_bytes));
+ media_log_->CreateStringEvent(
+ MediaLogEvent::TOTAL_BYTES_SET, "total_bytes",
+ base::Int64ToString(total_bytes)));
int64 total_mbytes = total_bytes >> 20;
if (total_mbytes > kint32max)
total_mbytes = kint32max;