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..3789702a598b28855d94ddcf0c354065c3a0fd7c 100644 |
--- a/content/common/gpu/media/vaapi_video_encode_accelerator.cc |
+++ b/content/common/gpu/media/vaapi_video_encode_accelerator.cc |
@@ -142,12 +142,15 @@ static unsigned int Log2OfPowerOf2(unsigned int x) { |
return log; |
} |
-VaapiVideoEncodeAccelerator::VaapiVideoEncodeAccelerator(Display* x_display) |
+VaapiVideoEncodeAccelerator::VaapiVideoEncodeAccelerator( |
+ gfx::GLContext* gl_context, |
+ const base::Callback<bool(void)>& make_context_current) |
: profile_(media::VIDEO_CODEC_PROFILE_UNKNOWN), |
mb_width_(0), |
mb_height_(0), |
output_buffer_byte_size_(0), |
- x_display_(x_display), |
+ make_context_current_(make_context_current), |
+ gl_context_(gl_context), |
state_(kUninitialized), |
frame_num_(0), |
last_idr_frame_num_(0), |
@@ -220,7 +223,8 @@ bool VaapiVideoEncodeAccelerator::Initialize( |
vaapi_wrapper_ = VaapiWrapper::Create(VaapiWrapper::kEncode, |
output_profile, |
- x_display_, |
+ gl_context_, |
+ make_context_current_, |
base::Bind(&ReportToUMA, VAAPI_ERROR)); |
if (!vaapi_wrapper_) { |
DVLOGF(1) << "Failed initializing VAAPI"; |