content/common/gpu/media/vaapi_video_decode_accelerator.cc - Issue 1848403003: Mac h264: Add a flag to specify GLImage status in hardware decode

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/vaapi_video_decode_accelerator.cc

Issue 1848403003: Mac h264: Add a flag to specify GLImage status in hardware decode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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/vaapi_video_decode_accelerator.h ('k') | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.cc b/content/common/gpu/media/vaapi_video_decode_accelerator.cc

index bda467b555e6a73db7415f8bdadd4d0a20135a7a..3bcfe211bc1861f01018c621378200aa12bff35b 100644

--- a/content/common/gpu/media/vaapi_video_decode_accelerator.cc

+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.cc

@@ -292,9 +292,8 @@ VaapiPicture* VaapiVideoDecodeAccelerator::PictureById(

}

VaapiVideoDecodeAccelerator::VaapiVideoDecodeAccelerator(

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

- const base::Callback<void(uint32_t, uint32_t, scoped_refptr<gl::GLImage>)>&

- bind_image)

+ const MakeContextCurrentCallback& make_context_current,

+ const BindImageCallback& bind_image)

: make_context_current_(make_context_current),

state_(kUninitialized),

input_ready_(&lock_),

@@ -750,7 +749,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(

if (image) {

DCHECK_LE(1u, buffers[i].internal_texture_ids().size());

bind_image_.Run(buffers[i].internal_texture_ids()[0],

- VaapiPicture::GetGLTextureTarget(), image);

+ VaapiPicture::GetGLTextureTarget(), image, true);

}

RETURN_AND_NOTIFY_ON_FAILURE(