AVDA: Use the SurfaceTexture matrix when copying on destruction

content/common/gpu/media/android_deferred_rendering_backing_strategy.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/android_deferred_rendering_backing_strategy.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 #include "base/android/build_info.h"
@@ skipping 12 matching lines @@
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/egl_util.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/scoped_binders.h"
 #include "ui/gl/scoped_make_current.h"
 
 namespace content {
 
-namespace {
-// clang-format off
-const float kIdentityMatrix[16] = {1.0f, 0.0f, 0.0f, 0.0f,
-                                   0.0f, 1.0f, 0.0f, 0.0f,
-                                   0.0f, 0.0f, 1.0f, 0.0f,
-                                   0.0f, 0.0f, 0.0f, 1.0f};
-// clang-format on
-}
-
 AndroidDeferredRenderingBackingStrategy::
     AndroidDeferredRenderingBackingStrategy(AVDAStateProvider* state_provider)
     : state_provider_(state_provider), media_codec_(nullptr) {}
 
 AndroidDeferredRenderingBackingStrategy::
     ~AndroidDeferredRenderingBackingStrategy() {}
 
 gfx::ScopedJavaSurface AndroidDeferredRenderingBackingStrategy::Initialize(
     int surface_view_id) {
   shared_state_ = new AVDASharedState();
@@ skipping 237 matching lines @@
     gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_2D, tmp_texture_id);
     // The target texture's size will exactly match the source.
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size.width(), size.height(), 0,
                  GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
   }
 
-  // TODO(liberato,watk): Use the SurfaceTexture matrix when copying.
+
+
+  float transform_matrix[16];
+  surface_texture_->GetTransformMatrix(transform_matrix);
+
   gpu::CopyTextureCHROMIUMResourceManager copier;
   copier.Initialize(
       gl_decoder,
       gl_decoder->GetContextGroup()->feature_info()->feature_flags());
   copier.DoCopyTextureWithTransform(gl_decoder, GL_TEXTURE_EXTERNAL_OES,
                                     shared_state_->surface_texture_service_id(),
                                     GL_TEXTURE_2D, tmp_texture_id, size.width(),
-                                    size.height(), false, false, false,
-                                    kIdentityMatrix);
+                                    size.height(), true, false, false,
+                                    transform_matrix);
 
   // Create an EGLImage from the 2D texture we just copied into. By associating
   // the EGLImage with the PictureBuffer textures they will remain valid even
   // after we delete the 2D texture and EGLImage.
   const EGLImageKHR egl_image = eglCreateImageKHR(
       gfx::GLSurfaceEGL::GetHardwareDisplay(), eglGetCurrentContext(),
       EGL_GL_TEXTURE_2D_KHR, reinterpret_cast<EGLClientBuffer>(tmp_texture_id),
       nullptr /* attrs */);
 
   glDeleteTextures(1, &tmp_texture_id);
@@ skipping 47 matching lines @@
           base::ToLowerASCII(base::android::BuildInfo::GetInstance()->model()));
       if (model.find("a114") != std::string::npos)
         surface_texture_detach_works = false;
     }
   }
 
   return surface_texture_detach_works;
 }
 
 }  // namespace content