Upstream version 8.36.156.0

[platform/framework/web/crosswalk.git] / src / content / common / gpu / media / vaapi_video_decode_accelerator_wayland.cc

diff --git a/src/content/common/gpu/media/vaapi_video_decode_accelerator_wayland.cc b/src/content/common/gpu/media/vaapi_video_decode_accelerator_wayland.cc
index 873c435..fd848cf 100644 (file)
--- a/src/content/common/gpu/media/vaapi_video_decode_accelerator_wayland.cc
+++ b/src/content/common/gpu/media/vaapi_video_decode_accelerator_wayland.cc
@@ -190,6 +190,16 @@ bool VaapiVideoDecodeAccelerator::TFPPicture::Upload(VASurfaceID surface) {
   gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_2D, texture_id_);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+
+  unsigned int al = 4 * size_.width();
+  if (al != va_image_.pitches[0]) {
+    // Not aligned phenomenon occurs only in special size video in None-X11.
+    // So re-check RGBA data alignment and realign filled video frame in need.
+    unsigned char* bhandle = static_cast<unsigned char*>(buffer);
+    for (int i = 0; i < size_.height(); i++) {
+      memcpy(bhandle + (i * al), bhandle + (i * (va_image_.pitches[0])), al);
+    }
+  }
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size_.width(), size_.height(),
                0, GL_RGBA, GL_UNSIGNED_BYTE, buffer);