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

Unified Diff: content/renderer/media/android/media_source_delegate.cc

Issue 1047313002: 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: Fix compile on Android 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 | « no previous file | media/base/media_log.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/android/media_source_delegate.cc
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index 792148e9b7cebc303ce05e8fe587deb641b52aaa..b22a68a30a7c5b737833b18ac6068d32833f1c48 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -40,12 +40,6 @@ const uint8 kVorbisPadding[] = { 0xff, 0xff, 0xff, 0xff };
namespace content {
-static void AddLogEntry(const scoped_refptr<media::MediaLog>& media_log,
- media::MediaLog::MediaLogLevel level,
- const std::string& message) {
- media_log->AddEvent(media_log->CreateLogEvent(level, message));
-}
-
MediaSourceDelegate::MediaSourceDelegate(
RendererDemuxerAndroid* demuxer_client,
int demuxer_client_id,
@@ -171,7 +165,8 @@ void MediaSourceDelegate::InitializeMediaSource(
base::Bind(&MediaSourceDelegate::OnDemuxerOpened, main_weak_this_)),
media::BindToCurrentLoop(base::Bind(
&MediaSourceDelegate::OnEncryptedMediaInitData, main_weak_this_)),
- base::Bind(&AddLogEntry, media_log_), media_log_, false));
+ base::Bind(&media::MediaLog::AddLogEvent, media_log_), media_log_,
+ false));
// |this| will be retained until StopDemuxer() is posted, so Unretained() is
// safe here.
@@ -670,7 +665,8 @@ void MediaSourceDelegate::OnDemuxerOpened() {
return;
media_source_opened_cb_.Run(new media::WebMediaSourceImpl(
- chunk_demuxer_.get(), base::Bind(&AddLogEntry, media_log_)));
+ chunk_demuxer_.get(),
+ base::Bind(&media::MediaLog::AddLogEvent, media_log_)));
}
void MediaSourceDelegate::OnEncryptedMediaInitData(
« no previous file with comments | « no previous file | media/base/media_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698