media/filters/gpu_video_decoder.cc - Issue 9295020: Fix ChunkDemuxer seek deadlock

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/gpu_video_decoder.cc

Issue 9295020: Fix ChunkDemuxer seek deadlock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressing more CR comments Created 8 years, 11 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:

Index: media/filters/gpu_video_decoder.cc

diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc

index 193ccd837f7b07ec6731f5cc8c55b1a07a2eab0c..c839d0435946a0ad1ffe2bc172721759d5281ca8 100644

--- a/media/filters/gpu_video_decoder.cc

+++ b/media/filters/gpu_video_decoder.cc

@@ -224,6 +224,16 @@ void GpuVideoDecoder::RequestBufferDecode(const scoped_refptr<Buffer>& buffer) {

}

demuxer_read_in_progress_ = false;

+ if (!buffer) {

+ if (pending_read_cb_.is_null())

+ return;

+ gvd_loop_proxy_->PostTask(FROM_HERE, base::Bind(

+ pending_read_cb_, scoped_refptr<VideoFrame>()));

+ pending_read_cb_.Reset();

+ return;

+ }

if (!vda_) {

EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEmptyFrame());

return;