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

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 1049393002: Revert of media-internals: Simplify the code path for creating a media log entry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@MEDIA_LOG_INFO_ERROR_DEBUG
Patch Set: 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
« no previous file with comments | « media/base/media_log.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 775b501e09fde6e28a05857ada46b738b8b53085..2bbe40c7dfd97cead02408dbc2bcd6a2209bc2a5 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -103,6 +103,12 @@
(DCHECK(main_task_runner_->BelongsToCurrentThread()), \
BindToCurrentLoop(base::Bind(function, AsWeakPtr(), arg1)))
+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(
const std::string& init_data_type) {
if (init_data_type == "cenc")
@@ -831,7 +837,7 @@
void WebMediaPlayerImpl::OnDemuxerOpened() {
DCHECK(main_task_runner_->BelongsToCurrentThread());
client_->mediaSourceOpened(new WebMediaSourceImpl(
- chunk_demuxer_, base::Bind(&MediaLog::AddLogEvent, media_log_)));
+ chunk_demuxer_, base::Bind(&AddLogEntry, media_log_)));
}
void WebMediaPlayerImpl::OnAddTextTrack(
@@ -901,7 +907,7 @@
DCHECK(!chunk_demuxer_);
DCHECK(!data_source_);
- mse_log_cb = base::Bind(&MediaLog::AddLogEvent, media_log_);
+ mse_log_cb = base::Bind(&AddLogEntry, media_log_);
chunk_demuxer_ = new ChunkDemuxer(
BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),
« no previous file with comments | « media/base/media_log.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698