Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(858)

Unified Diff: media/base/media_log.cc

Issue 11471006: Log MediaSource parsing errors to the MediaLog so they can appear in chrome:media-internals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nit. Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/media_log.h ('k') | media/base/media_log_event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_log.cc
diff --git a/media/base/media_log.cc b/media/base/media_log.cc
index cadf29105489e241357ca7a2d678771cf53b16af..abd845b30053d57354c954fa93faed58d05b0c6e 100644
--- a/media/base/media_log.cc
+++ b/media/base/media_log.cc
@@ -54,6 +54,8 @@ const char* MediaLog::EventTypeToString(MediaLogEvent::Type type) {
return "AUDIO_RENDERER_DISABLED";
case MediaLogEvent::BUFFERED_EXTENTS_CHANGED:
return "BUFFERED_EXTENTS_CHANGED";
+ case MediaLogEvent::MEDIA_SOURCE_ERROR:
+ return "MEDIA_SOURCE_ERROR";
}
NOTREACHED();
return NULL;
@@ -98,6 +100,14 @@ const char* MediaLog::PipelineStatusToString(PipelineStatus status) {
return NULL;
}
+LogHelper::LogHelper(const LogCB& log_cb) : log_cb_(log_cb) {}
+
+LogHelper::~LogHelper() {
+ if (log_cb_.is_null())
+ return;
+ log_cb_.Run(stream_.str());
+}
+
MediaLog::MediaLog() : id_(g_media_log_count.GetNext()) {}
MediaLog::~MediaLog() {}
@@ -178,4 +188,12 @@ scoped_ptr<MediaLogEvent> MediaLog::CreateBufferedExtentsChangedEvent(
return event.Pass();
}
+scoped_ptr<MediaLogEvent> MediaLog::CreateMediaSourceErrorEvent(
+ const std::string& error) {
+ scoped_ptr<MediaLogEvent> event(
+ CreateEvent(MediaLogEvent::MEDIA_SOURCE_ERROR));
+ event->params.SetString("error", error);
+ return event.Pass();
+}
+
} //namespace media
« no previous file with comments | « media/base/media_log.h ('k') | media/base/media_log_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698