content/common/gpu/media/vaapi_video_encode_accelerator.h - Issue 490233002: VaapiVideoAccelerator: make Vaapi accelerator work with ozone

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

Issue 490233002: VaapiVideoAccelerator: make Vaapi accelerator work with ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More VaapiPictureProviderDrm cleanup Created 6 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

« content/common/gpu/media/vaapi_picture_provider_x11.cc ('K') | « content/common/gpu/media/vaapi_video_decode_accelerator.cc ('k') | content/common/gpu/media/vaapi_video_encode_accelerator.cc » ('j') | content/common/gpu/media/vaapi_wrapper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8a7811a3ec7808fcf3c352550b717591280823f6..4ac2d724e8c18781428771d69f4835ec5e8784db 100644

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

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

@@ -25,7 +25,7 @@ namespace content {

class CONTENT_EXPORT VaapiVideoEncodeAccelerator

: public media::VideoEncodeAccelerator {

public:

- explicit VaapiVideoEncodeAccelerator(Display* x_display);

+ VaapiVideoEncodeAccelerator();

virtual ~VaapiVideoEncodeAccelerator();

// media::VideoEncodeAccelerator implementation.

@@ -152,7 +152,7 @@ class CONTENT_EXPORT VaapiVideoEncodeAccelerator

// VaapiWrapper is the owner of all HW resources (surfaces and buffers)

// and will free them on destruction.

- scoped_ptr<VaapiWrapper> vaapi_wrapper_;

+ scoped_refptr<VaapiWrapper> vaapi_wrapper_;

// Input profile and sizes.

media::VideoCodecProfile profile_;

@@ -179,8 +179,6 @@ class CONTENT_EXPORT VaapiVideoEncodeAccelerator

// Size in bytes required for input bitstream buffers.

size_t output_buffer_byte_size_;

- Display* x_display_;

// All of the members below must be accessed on the encoder_thread_,

// while it is running.