AVDACodecImages keep a reference to the SurfaceTexture backing them

content/common/gpu/media/avda_codec_image.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/avda_codec_image.h"
 
 #include <string.h>
 
 #include "base/metrics/histogram_macros.h"
 #include "content/common/gpu/media/avda_shared_state.h"
-#include "gpu/command_buffer/service/context_group.h"
-#include "gpu/command_buffer/service/context_state.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/scoped_make_current.h"
 
 namespace content {
 
 AVDACodecImage::AVDACodecImage(
     const scoped_refptr<AVDASharedState>& shared_state,
@@ skipping 40 matching lines @@
 
   // Verify that the currently bound texture is the right one.  If we're not
   // copying to a Texture that shares our service_id, then we can't do much.
   // This will force a copy.
   // TODO(liberato): Fall back to a copy that uses the texture matrix.
   GLint bound_service_id = 0;
   glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, &bound_service_id);
   if (bound_service_id != shared_state_->surface_texture_service_id())
     return false;
 
-  // Attach the surface texture to our GL context if needed.
+  // Attach the surface texture to the first context we're bound on, so that
+  // no context switch is needed later.
   if (!shared_state_->surface_texture_is_attached())
     AttachSurfaceTextureToContext();
 
   // Make sure that we have the right image in the front buffer.
   UpdateSurfaceTexture();
 
+  // TODO(liberato): Improve the way we handle the texture matrix.
+  // crbug.com/530681
   InstallTextureMatrix();
 
-  // TODO(liberato): Handle the texture matrix properly.
-  // Either we can update the shader with it or we can move all of the logic
-  // to updateTexImage() to the right place in the cc to send it to the shader.
-  // For now, we just skip it.  crbug.com/530681
-
   // By setting image state to UNBOUND instead of COPIED we ensure that
   // CopyTexImage() is called each time the surface texture is used for drawing.
   // It would be nice if we could do this via asking for the currently bound
   // Texture, but the active unit never seems to change.
   texture_->SetLevelImage(GL_TEXTURE_EXTERNAL_OES, 0, this,
                           gpu::gles2::Texture::UNBOUND);
 
   return true;
 }
 
@@ skipping 61 matching lines @@
 }
 
 int AVDACodecImage::GetMediaCodecBufferIndex() const {
   return codec_buffer_index_;
 }
 
 void AVDACodecImage::SetSize(const gfx::Size& size) {
   size_ = size;
 }
 
-void AVDACodecImage::SetMediaCodec(media::MediaCodecBridge* codec) {
+void AVDACodecImage::SetMediaCodec(media::VideoCodecBridge* codec) {
   media_codec_ = codec;
 }
 
 void AVDACodecImage::SetTexture(gpu::gles2::Texture* texture) {
   texture_ = texture;
 }
 
 void AVDACodecImage::AttachSurfaceTextureToContext() {
   DCHECK(surface_texture_);
 
   // Attach the surface texture to the first context we're bound on, so that
   // no context switch is needed later.
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
   // The surface texture is already detached, so just attach it.
   // We could do this earlier, but SurfaceTexture has context affinity, and we
   // don't want to require a context switch.
   surface_texture_->AttachToGLContext();
-  shared_state_->did_attach_surface_texture();
+  shared_state_->DidAttachSurfaceTexture();
 }
 
 void AVDACodecImage::InstallTextureMatrix() {
   DCHECK(surface_texture_);
 
   // glUseProgram() has been run already -- just modify the uniform.
   // Updating this via VideoFrameProvider::Client::DidUpdateMatrix() would
   // be a better solution, except that we'd definitely miss a frame at this
   // point in drawing.
   // Our current method assumes that we'll end up being a stream resource,
@@ skipping 13 matching lines @@
     // Only try once.
     need_shader_info_ = false;
   }
 
   if (texmatrix_uniform_location_ >= 0) {
     glUniformMatrix4fv(texmatrix_uniform_location_, 1, false, gl_matrix_);
   }
 }
 
 }  // namespace content