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

Unified Diff: content/renderer/media/webmediaplayer_ms_compositor.cc

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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: content/renderer/media/webmediaplayer_ms_compositor.cc
diff --git a/content/renderer/media/webmediaplayer_ms_compositor.cc b/content/renderer/media/webmediaplayer_ms_compositor.cc
index 90803e2a1d1a8604e10e7dbeeb1e18699eb20020..99336fc6e68a23f9cc84f488f385648b208a11ab 100644
--- a/content/renderer/media/webmediaplayer_ms_compositor.cc
+++ b/content/renderer/media/webmediaplayer_ms_compositor.cc
@@ -14,7 +14,6 @@
#include "cc/paint/skia_paint_canvas.h"
#include "content/renderer/media/webmediaplayer_ms.h"
#include "content/renderer/render_thread_impl.h"
-#include "media/base/media_log.h"
#include "media/base/media_switches.h"
#include "media/base/video_frame.h"
#include "media/base/video_util.h"
@@ -130,11 +129,9 @@ scoped_refptr<media::VideoFrame> CopyFrame(
WebMediaPlayerMSCompositor::WebMediaPlayerMSCompositor(
const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
const blink::WebMediaStream& web_stream,
- const base::WeakPtr<WebMediaPlayerMS>& player,
- scoped_refptr<media::MediaLog> media_log)
+ const base::WeakPtr<WebMediaPlayerMS>& player)
: compositor_task_runner_(compositor_task_runner),
player_(player),
- media_log_(std::move(media_log)),
video_frame_provider_client_(nullptr),
current_frame_used_by_compositor_(false),
last_render_length_(base::TimeDelta::FromSecondsD(1.0 / 60.0)),
@@ -157,7 +154,7 @@ WebMediaPlayerMSCompositor::WebMediaPlayerMSCompositor(
rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm(
base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks,
base::Unretained(this)),
- media_log_));
+ &media_log_));
}
// Just for logging purpose.
@@ -463,7 +460,7 @@ void WebMediaPlayerMSCompositor::SetAlgorithmEnabledForTesting(
rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm(
base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks,
base::Unretained(this)),
- media_log_));
+ &media_log_));
}
}
« no previous file with comments | « content/renderer/media/webmediaplayer_ms_compositor.h ('k') | content/renderer/media/webmediaplayer_ms_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698