content/common/gpu/media/dxva_video_decode_accelerator.cc - Issue 10826238: Ensure that the correct open gl context is made current before attempting to write to the open

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: content/common/gpu/media/dxva_video_decode_accelerator.cc

Issue 10826238: Ensure that the correct open gl context is made current before attempting to write to the open (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 4 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 | « content/common/gpu/media/dxva_video_decode_accelerator.h ('k') | content/common/gpu/media/gpu_video_decode_accelerator.cc » ('j') | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/dxva_video_decode_accelerator.cc

===================================================================

--- content/common/gpu/media/dxva_video_decode_accelerator.cc (revision 150635)

+++ content/common/gpu/media/dxva_video_decode_accelerator.cc (working copy)

@@ -499,12 +499,14 @@

}

DXVAVideoDecodeAccelerator::DXVAVideoDecodeAccelerator(

- media::VideoDecodeAccelerator::Client* client)

+ media::VideoDecodeAccelerator::Client* client,

+ const base::Callback<bool(void)>& make_context_current)

: client_(client),

egl_config_(NULL),

state_(kUninitialized),

pictures_requested_(false),

- inputs_before_decode_(0) {

+ inputs_before_decode_(0),

+ make_context_current_(make_context_current) {

memset(&input_stream_info_, 0, sizeof(input_stream_info_));

memset(&output_stream_info_, 0, sizeof(output_stream_info_));

}

@@ -965,6 +967,11 @@

if (pending_output_samples_.empty())

return;

+ if (!make_context_current_.Run()) {

+ StopOnError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);

+ return;

+ }

OutputBuffers::iterator index;

for (index = output_picture_buffers_.begin();