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

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 1041353002: media-internals: Differentiate error, info, and debug log messages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Attempt to fix android compile error Created 5 years, 9 months 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
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 87c90c541d26c34f624b162754eb6c0eef33c72e..2bbe40c7dfd97cead02408dbc2bcd6a2209bc2a5 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -103,9 +103,10 @@ STATIC_ASSERT_MATCHING_ENUM(UseCredentials);
(DCHECK(main_task_runner_->BelongsToCurrentThread()), \
BindToCurrentLoop(base::Bind(function, AsWeakPtr(), arg1)))
-static void LogMediaSourceError(const scoped_refptr<MediaLog>& media_log,
- const std::string& error) {
- media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error));
+static void AddLogEntry(const scoped_refptr<MediaLog>& media_log,
+ MediaLog::MediaLogLevel level,
+ const std::string& message) {
+ media_log->AddEvent(media_log->CreateLogEvent(level, message));
}
static blink::WebEncryptedMediaInitDataType ConvertInitDataType(
@@ -836,7 +837,7 @@ void WebMediaPlayerImpl::OnPipelineBufferingStateChanged(
void WebMediaPlayerImpl::OnDemuxerOpened() {
DCHECK(main_task_runner_->BelongsToCurrentThread());
client_->mediaSourceOpened(new WebMediaSourceImpl(
- chunk_demuxer_, base::Bind(&LogMediaSourceError, media_log_)));
+ chunk_demuxer_, base::Bind(&AddLogEntry, media_log_)));
}
void WebMediaPlayerImpl::OnAddTextTrack(
@@ -906,7 +907,7 @@ void WebMediaPlayerImpl::StartPipeline() {
DCHECK(!chunk_demuxer_);
DCHECK(!data_source_);
- mse_log_cb = base::Bind(&LogMediaSourceError, media_log_);
+ mse_log_cb = base::Bind(&AddLogEntry, media_log_);
chunk_demuxer_ = new ChunkDemuxer(
BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),

Powered by Google App Engine
This is Rietveld 408576698