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

Unified Diff: media/base/pipeline_impl.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
« no previous file with comments | « media/base/pipeline_impl.h ('k') | media/base/pipeline_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_impl.cc
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index a1e47d1e1908a49e92c375a36c6ffdf3fed7b45b..9f074c07991b89ff7bbf8958bc98395562996ea2 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -48,7 +48,7 @@ class PipelineImpl::RendererWrapper : public DemuxerHost,
public RendererClient {
public:
RendererWrapper(scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
- scoped_refptr<MediaLog> media_log);
+ MediaLog* media_log);
~RendererWrapper() final;
void Start(Demuxer* demuxer,
@@ -149,7 +149,7 @@ class PipelineImpl::RendererWrapper : public DemuxerHost,
const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
const scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
- const scoped_refptr<MediaLog> media_log_;
+ MediaLog* const media_log_;
base::WeakPtr<PipelineImpl> weak_pipeline_;
Demuxer* demuxer_;
@@ -187,10 +187,10 @@ class PipelineImpl::RendererWrapper : public DemuxerHost,
PipelineImpl::RendererWrapper::RendererWrapper(
scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
- scoped_refptr<MediaLog> media_log)
+ MediaLog* media_log)
: media_task_runner_(std::move(media_task_runner)),
main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
- media_log_(std::move(media_log)),
+ media_log_(media_log),
demuxer_(nullptr),
playback_rate_(kDefaultPlaybackRate),
volume_(kDefaultVolume),
« no previous file with comments | « media/base/pipeline_impl.h ('k') | media/base/pipeline_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698