AVDA: Use the SurfaceTexture matrix when copying on destruction

content/common/gpu/media/android_copying_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_copying_backing_strategy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "content/common/gpu/media/avda_return_on_failure.h"
@@ skipping 94 matching lines @@
     media_codec_->ReleaseOutputBuffer(codec_buf_index, true);
   }
 
   {
     TRACE_EVENT0("media", "AVDA::UpdateTexImage");
     surface_texture_->UpdateTexImage();
   }
 
   float transform_matrix[16];
   surface_texture_->GetTransformMatrix(transform_matrix);
-  // add y-flip to correct UV coordinate systems.
-  transform_matrix[13] += transform_matrix[5];
-  transform_matrix[5] = -transform_matrix[5];
 
   uint32_t picture_buffer_texture_id = picture_buffer.texture_id();
 
   // Defer initializing the CopyTextureCHROMIUMResourceManager until it is
   // needed because it takes 10s of milliseconds to initialize.
   if (!copier_) {
     copier_.reset(new gpu::CopyTextureCHROMIUMResourceManager());
     copier_->Initialize(state_provider_->GetGlDecoder().get(),
                         state_provider_->GetGlDecoder()->GetContextGroup()->
                             feature_info()->feature_flags());
   }
 
   // Here, we copy |surface_texture_id_| to the picture buffer instead of
   // setting new texture to |surface_texture_| by calling attachToGLContext()
   // because:
   // 1. Once we call detachFrameGLContext(), it deletes the texture previously
   //    attached.
   // 2. SurfaceTexture requires us to apply a transform matrix when we show
   //    the texture.
   copier_->DoCopyTextureWithTransform(
       state_provider_->GetGlDecoder().get(), GL_TEXTURE_EXTERNAL_OES,
       surface_texture_id_, GL_TEXTURE_2D, picture_buffer_texture_id,
       state_provider_->GetSize().width(), state_provider_->GetSize().height(),
-      false, false, false, transform_matrix);
+      true, false, false, transform_matrix);
 }
 
 void AndroidCopyingBackingStrategy::CodecChanged(
     media::VideoCodecBridge* codec,
     const AndroidVideoDecodeAccelerator::OutputBufferMap&) {
   media_codec_ = codec;
 }
 
 void AndroidCopyingBackingStrategy::OnFrameAvailable() {
   // TODO(liberato): crbug.com/574948 .  The OnFrameAvailable logic can be
@@ skipping 28 matching lines @@
   RETURN_IF_NULL(texture_ref);
   gpu::gles2::TextureManager* texture_manager =
       state_provider_->GetGlDecoder()->GetContextGroup()->texture_manager();
   RETURN_IF_NULL(texture_manager);
   texture_manager->SetLevelInfo(texture_ref, GetTextureTarget(), 0, GL_RGBA,
                                 new_size.width(), new_size.height(), 1, 0,
                                 GL_RGBA, GL_UNSIGNED_BYTE, gfx::Rect(new_size));
 }
 
 }  // namespace content