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

Side by Side Diff: content/renderer/media/media_stream_video_renderer_sink.cc

Issue 1686123004: Post GpuMemoryBufferVideoFramePool deletion on media thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Not using WeakPtr Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_renderer_sink_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream_video_renderer_sink.h" 5 #include "content/renderer/media/media_stream_video_renderer_sink.h"
6 6
7 #include "base/single_thread_task_runner.h" 7 #include "base/single_thread_task_runner.h"
8 #include "base/thread_task_runner_handle.h" 8 #include "base/thread_task_runner_handle.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "media/base/bind_to_current_loop.h" 10 #include "media/base/bind_to_current_loop.h"
(...skipping 22 matching lines...) Expand all
33 media_task_runner_(media_task_runner), 33 media_task_runner_(media_task_runner),
34 weak_factory_(this) { 34 weak_factory_(this) {
35 if (gpu_factories && 35 if (gpu_factories &&
36 gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) { 36 gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) {
37 gpu_memory_buffer_pool_.reset(new media::GpuMemoryBufferVideoFramePool( 37 gpu_memory_buffer_pool_.reset(new media::GpuMemoryBufferVideoFramePool(
38 media_task_runner, worker_task_runner, gpu_factories)); 38 media_task_runner, worker_task_runner, gpu_factories));
39 } 39 }
40 } 40 }
41 41
42 MediaStreamVideoRendererSink::~MediaStreamVideoRendererSink() { 42 MediaStreamVideoRendererSink::~MediaStreamVideoRendererSink() {
43 if (gpu_memory_buffer_pool_) {
44 media_task_runner_->DeleteSoon(FROM_HERE,
45 gpu_memory_buffer_pool_.release());
46 }
43 } 47 }
44 48
45 void MediaStreamVideoRendererSink::Start() { 49 void MediaStreamVideoRendererSink::Start() {
46 DCHECK(task_runner_->BelongsToCurrentThread()); 50 DCHECK(task_runner_->BelongsToCurrentThread());
47 DCHECK_EQ(state_, STOPPED); 51 DCHECK_EQ(state_, STOPPED);
48 52
49 AddToVideoTrack( 53 AddToVideoTrack(
50 this, 54 this,
51 media::BindToCurrentLoop( 55 media::BindToCurrentLoop(
52 base::Bind( 56 base::Bind(
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 DCHECK(task_runner_->BelongsToCurrentThread()); 106 DCHECK(task_runner_->BelongsToCurrentThread());
103 DCHECK(frame); 107 DCHECK(frame);
104 if (state_ != STARTED) 108 if (state_ != STARTED)
105 return; 109 return;
106 110
107 if (!gpu_memory_buffer_pool_) { 111 if (!gpu_memory_buffer_pool_) {
108 FrameReady(frame); 112 FrameReady(frame);
109 return; 113 return;
110 } 114 }
111 115
116 // |gpu_memory_buffer_pool_| deletion is going to be posted to
117 // |media_task_runner_|. base::Unretained() usage is fine since
118 // |gpu_memory_buffer_pool_| outlives the task.
112 media_task_runner_->PostTask( 119 media_task_runner_->PostTask(
113 FROM_HERE, 120 FROM_HERE,
114 base::Bind( 121 base::Bind(
115 &media::GpuMemoryBufferVideoFramePool::MaybeCreateHardwareFrame, 122 &media::GpuMemoryBufferVideoFramePool::MaybeCreateHardwareFrame,
116 base::Unretained(gpu_memory_buffer_pool_.get()), frame, 123 base::Unretained(gpu_memory_buffer_pool_.get()), frame,
117 media::BindToCurrentLoop( 124 media::BindToCurrentLoop(
118 base::Bind(&MediaStreamVideoRendererSink::FrameReady, 125 base::Bind(&MediaStreamVideoRendererSink::FrameReady,
119 weak_factory_.GetWeakPtr())))); 126 weak_factory_.GetWeakPtr()))));
120 } 127 }
121 128
(...skipping 19 matching lines...) Expand all
141 scoped_refptr<media::VideoFrame> video_frame = 148 scoped_refptr<media::VideoFrame> video_frame =
142 media::VideoFrame::CreateBlackFrame(frame_size_); 149 media::VideoFrame::CreateBlackFrame(frame_size_);
143 video_frame->metadata()->SetBoolean(media::VideoFrameMetadata::END_OF_STREAM, 150 video_frame->metadata()->SetBoolean(media::VideoFrameMetadata::END_OF_STREAM,
144 true); 151 true);
145 video_frame->metadata()->SetTimeTicks( 152 video_frame->metadata()->SetTimeTicks(
146 media::VideoFrameMetadata::REFERENCE_TIME, base::TimeTicks::Now()); 153 media::VideoFrameMetadata::REFERENCE_TIME, base::TimeTicks::Now());
147 OnVideoFrame(video_frame, base::TimeTicks()); 154 OnVideoFrame(video_frame, base::TimeTicks());
148 } 155 }
149 156
150 } // namespace content 157 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_renderer_sink_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698