Relocate SurfaceTexture usage from AVDA GLImage into shared state.

media/gpu/avda_shared_state.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 "media/gpu/avda_shared_state.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
 #include "media/gpu/avda_codec_image.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/scoped_make_current.h"
 
 namespace media {
 
 AVDASharedState::AVDASharedState()
     : surface_texture_service_id_(0),
       frame_available_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
-                             base::WaitableEvent::InitialState::NOT_SIGNALED) {}
+                             base::WaitableEvent::InitialState::NOT_SIGNALED),
+
+      gl_matrix_{
+          1, 0, 1, 0,  // Default to a sane guess just in case we can't get the

[liberato (no reviews please), 2016/10/05 15:35:17]

methinks that the 1 in the third column should be zero.  the 1 in the fourth row
in the original is added by the y flip to translate along y.

i'll cq this and land a follow-up.

+          0, 1, 0, 0,  // matrix on the first call. Will be Y-flipped later.
+          0, 0, 1, 0,  //
+          0, 0, 0, 1,  // Comment preserves 4x4 formatting.
+      } {}
 
 AVDASharedState::~AVDASharedState() {
   if (!surface_texture_service_id_)
     return;
 
   ui::ScopedMakeCurrent scoped_make_current(context_.get(), surface_.get());
   if (scoped_make_current.Succeeded()) {
     glDeleteTextures(1, &surface_texture_service_id_);
     DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   }
@@ skipping 70 matching lines @@
 
 void AVDASharedState::RenderCodecBufferToSurfaceTexture(
     MediaCodecBridge* codec,
     int codec_buffer_index) {
   if (!release_time_.is_null())
     WaitForFrameAvailable();
   codec->ReleaseOutputBuffer(codec_buffer_index, true);
   release_time_ = base::TimeTicks::Now();
 }
 
+void AVDASharedState::UpdateTexImage() {
+  surface_texture_->UpdateTexImage();
+  // Helpfully, this is already column major.
+  surface_texture_->GetTransformMatrix(gl_matrix_);
+}
+
+void AVDASharedState::GetTransformMatrix(float matrix[16]) const {
+  memcpy(matrix, gl_matrix_, sizeof(gl_matrix_));
+}
+
 }  // namespace media