Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ozone / media / vaapi_video_decode_accelerator.cc

diff --git a/src/ozone/media/vaapi_video_decode_accelerator.cc b/src/ozone/media/vaapi_video_decode_accelerator.cc
index 8f5109b..08dabcb 100644 (file)
--- a/src/ozone/media/vaapi_video_decode_accelerator.cc
+++ b/src/ozone/media/vaapi_video_decode_accelerator.cc
@@ -363,7 +363,7 @@ bool VaapiVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile,
 
   vaapi_wrapper_ = VaapiWrapper::Create(
       profile,
-      gfx::GLSurfaceEGL::GetNativeDisplay(),
+      reinterpret_cast<void*>(gfx::GLSurfaceEGL::GetNativeDisplay()),
       base::Bind(&ReportToUMA, VaapiH264Decoder::VAAPI_ERROR));
 
   if (!vaapi_wrapper_.get()) {
@@ -452,8 +452,11 @@ void VaapiVideoDecodeAccelerator::OutputPicture(
   TRACE_COUNTER1("Video Decoder", "Textures at client", num_frames_at_client_);
   DVLOG(4) << "Notifying output picture id " << output_id
            << " for input "<< input_id << " is ready";
+  // TODO(posciak): Use visible size from decoder here instead
+  // (crbug.com/402760).
   if (client_)
-    client_->PictureReady(media::Picture(output_id, input_id));
+    client_->PictureReady(
+        media::Picture(output_id, input_id, gfx::Rect(tfp_picture->size())));
 }
 
 void VaapiVideoDecodeAccelerator::TryOutputSurface() {