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

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

Patch Set: Don't limit h264_bitstream_buffer_unittest to x11 Created 6 years, 3 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_video_encode_accelerator.h ('K') | « content/common/gpu/media/vaapi_video_encode_accelerator.h ('k') | content/common/gpu/media/vaapi_wrapper.h » ('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.cc

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

index 022bec9a6c0a96e31590f482be110ce1bad02aeb..f05e537b666b8879be9e8cbe0b6d51b662fd3283 100644

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

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

@@ -142,12 +142,11 @@ static unsigned int Log2OfPowerOf2(unsigned int x) {

return log;

}

-VaapiVideoEncodeAccelerator::VaapiVideoEncodeAccelerator(Display* x_display)

+VaapiVideoEncodeAccelerator::VaapiVideoEncodeAccelerator()

: profile_(media::VIDEO_CODEC_PROFILE_UNKNOWN),

mb_width_(0),

mb_height_(0),

output_buffer_byte_size_(0),

- x_display_(x_display),

state_(kUninitialized),

frame_num_(0),

last_idr_frame_num_(0),

@@ -220,7 +219,6 @@ bool VaapiVideoEncodeAccelerator::Initialize(

vaapi_wrapper_ = VaapiWrapper::Create(VaapiWrapper::kEncode,

output_profile,

- x_display_,

base::Bind(&ReportToUMA, VAAPI_ERROR));

if (!vaapi_wrapper_) {

DVLOGF(1) << "Failed initializing VAAPI";