content/common/gpu/media/vaapi_picture.cc - Issue 1839193003: Reland: Introduce GpuVideoDecodeAcceleratorFactory.

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_picture.cc

Issue 1839193003: Reland: Introduce GpuVideoDecodeAcceleratorFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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_picture.h ('k') | content/common/gpu/media/vaapi_tfp_picture.h » ('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/vaapi_picture.cc

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

index 5222bd2350426379129c2b4865db7296bb8f5e76..cdf8c355974c815a7ce7b198bfaff91f72c3d633 100644

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

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

@@ -18,16 +18,16 @@ namespace content {

// static

linked_ptr<VaapiPicture> VaapiPicture::CreatePicture(

const scoped_refptr<VaapiWrapper>& vaapi_wrapper,

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

+ const MakeGLContextCurrentCallback& make_context_current_cb,

int32_t picture_buffer_id,

uint32_t texture_id,

const gfx::Size& size) {

linked_ptr<VaapiPicture> picture;

#if defined(USE_X11)

- picture.reset(new VaapiTFPPicture(vaapi_wrapper, make_context_current,

+ picture.reset(new VaapiTFPPicture(vaapi_wrapper, make_context_current_cb,

picture_buffer_id, texture_id, size));

#elif defined(USE_OZONE)

- picture.reset(new VaapiDrmPicture(vaapi_wrapper, make_context_current,

+ picture.reset(new VaapiDrmPicture(vaapi_wrapper, make_context_current_cb,

picture_buffer_id, texture_id, size));

#endif // USE_X11