content/common/gpu/media/vaapi_video_decode_accelerator.h - Issue 43283002: Enable GLX/EGL backend switching while run HW video decode with libva.

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.h

Issue 43283002: Enable GLX/EGL backend switching while run HW video decode with libva. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master

Patch Set: Refined based on Fischman's comments. Created 7 years, 2 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/gpu_video_decode_accelerator.cc ('k') | content/common/gpu/media/vaapi_video_decode_accelerator.cc » ('j') | content/content_common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 1755b98f3d5e37749b36bd36ee5f2b84644c118d..a5b796924f8753e32141fd846f7cd4b170d103c3 100644

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

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

@@ -48,6 +48,10 @@ class CONTENT_EXPORT VaapiVideoDecodeAccelerator

Display* x_display, GLXContext glx_context,

Client* client,

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

+ VaapiVideoDecodeAccelerator(

+ EGLDisplay egl_display, EGLContext egl_context,

+ Client* client,

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

virtual ~VaapiVideoDecodeAccelerator();

// media::VideoDecodeAccelerator implementation.

@@ -153,6 +157,8 @@ private:

// Client-provided X/GLX state.

Display* x_display_;

+ EGLDisplay egl_display_;

+ EGLContext egl_context_;

GLXContext glx_context_;

base::Callback<bool(void)> make_context_current_;

GLXFBConfig fb_config_;