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

Unified 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: 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_stream_video_renderer_sink.cc
diff --git a/content/renderer/media/media_stream_video_renderer_sink.cc b/content/renderer/media/media_stream_video_renderer_sink.cc
index 709f9d51d8f11139c35d11b2eb15235c36a52848..1fe69b26584d74dc9daf4df820dba92a1dc7ab7f 100644
--- a/content/renderer/media/media_stream_video_renderer_sink.cc
+++ b/content/renderer/media/media_stream_video_renderer_sink.cc
@@ -40,6 +40,10 @@ MediaStreamVideoRendererSink::MediaStreamVideoRendererSink(
}
MediaStreamVideoRendererSink::~MediaStreamVideoRendererSink() {
+ if (gpu_memory_buffer_pool_) {
+ media_task_runner_->DeleteSoon(FROM_HERE,
DaleCurtis 2016/02/11 01:28:02 You don't need the GetWeakPtr() method, just Delet
emircan 2016/02/11 01:34:48 I agree that this would work as well. I am reverti
+ gpu_memory_buffer_pool_.release());
+ }
}
void MediaStreamVideoRendererSink::Start() {
@@ -113,7 +117,7 @@ void MediaStreamVideoRendererSink::OnVideoFrame(
FROM_HERE,
base::Bind(
&media::GpuMemoryBufferVideoFramePool::MaybeCreateHardwareFrame,
- base::Unretained(gpu_memory_buffer_pool_.get()), frame,
+ gpu_memory_buffer_pool_->GetWeakPtr(), frame,
media::BindToCurrentLoop(
base::Bind(&MediaStreamVideoRendererSink::FrameReady,
weak_factory_.GetWeakPtr()))));

Powered by Google App Engine
This is Rietveld 408576698