AndroidVideoDecodeAccelerator can now render to a SurfaceView

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"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "media/base/limits.h"
 #include "media/video/picture.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace content {
 
 const static GLfloat 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};
 
-AndroidCopyingBackingStrategy::AndroidCopyingBackingStrategy()
-    : state_provider_(nullptr), surface_texture_id_(0), media_codec_(nullptr) {}
+AndroidCopyingBackingStrategy::AndroidCopyingBackingStrategy(
+    AVDAStateProvider* state_provider)
+    : state_provider_(state_provider),
+      surface_texture_id_(0),
+      media_codec_(nullptr) {}
 
 AndroidCopyingBackingStrategy::~AndroidCopyingBackingStrategy() {}
 
-void AndroidCopyingBackingStrategy::Initialize(
-    AVDAStateProvider* state_provider) {
-  state_provider_ = state_provider;
-}
+gfx::ScopedJavaSurface AndroidCopyingBackingStrategy::Initialize(
+    int surface_view_id) {
+  DCHECK_EQ(surface_view_id,

[dcheng, 2016/02/02 07:37:26]

Ultimately, this is invoked by a message sent by the renderer, right? Do we
really want to DCHECK here? Seems like we should fail gracefully
(https://www.chromium.org/Home/chromium-security/education/security-tips-for-i...)

[watk, 2016/02/02 19:56:45]

Done.

+            media::VideoDecodeAccelerator::Config::kNoSurfaceID);
 
-void AndroidCopyingBackingStrategy::Cleanup(
-    bool have_context,
-    const AndroidVideoDecodeAccelerator::OutputBufferMap&) {
-  DCHECK(state_provider_->ThreadChecker().CalledOnValidThread());
-  if (copier_)
-    copier_->Destroy();
-
-  if (surface_texture_id_ && have_context)
-    glDeleteTextures(1, &surface_texture_id_);
-}
-
-uint32_t AndroidCopyingBackingStrategy::GetTextureTarget() const {
-  return GL_TEXTURE_2D;
-}
-
-scoped_refptr<gfx::SurfaceTexture>
-AndroidCopyingBackingStrategy::CreateSurfaceTexture() {
+  // Create a texture and attach the SurfaceTexture to it.
   glGenTextures(1, &surface_texture_id_);
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_EXTERNAL_OES, surface_texture_id_);
 
   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);
+
   state_provider_->GetGlDecoder()->RestoreTextureUnitBindings(0);
   state_provider_->GetGlDecoder()->RestoreActiveTexture();
 
   surface_texture_ = gfx::SurfaceTexture::Create(surface_texture_id_);
 
+  return gfx::ScopedJavaSurface(surface_texture_.get());
+}
+
+void AndroidCopyingBackingStrategy::Cleanup(
+    bool have_context,
+    const AndroidVideoDecodeAccelerator::OutputBufferMap&) {
+  DCHECK(state_provider_->ThreadChecker().CalledOnValidThread());
+
+  if (copier_)
+    copier_->Destroy();
+
+  if (surface_texture_id_ && have_context)
+    glDeleteTextures(1, &surface_texture_id_);
+}
+
+scoped_refptr<gfx::SurfaceTexture>
+AndroidCopyingBackingStrategy::GetSurfaceTexture() const {
   return surface_texture_;
 }
 
+uint32_t AndroidCopyingBackingStrategy::GetTextureTarget() const {
+  return GL_TEXTURE_2D;
+}
+
 void AndroidCopyingBackingStrategy::UseCodecBufferForPictureBuffer(
     int32_t codec_buf_index,
     const media::PictureBuffer& picture_buffer) {
   // Make sure that the decoder is available.
   RETURN_ON_FAILURE(state_provider_, state_provider_->GetGlDecoder().get(),
                     "Failed to get gles2 decoder instance.", ILLEGAL_STATE);
 
   // Render the codec buffer into |surface_texture_|, and switch it to be
   // the front buffer.
   // This ignores the emitted ByteBuffer and instead relies on rendering to
@@ skipping 58 matching lines @@
   media_codec_ = codec;
 }
 
 void AndroidCopyingBackingStrategy::OnFrameAvailable() {
   // TODO(liberato): crbug.com/574948 .  The OnFrameAvailable logic can be
   // moved into AVDA, and we should wait for it before doing the copy.
   // Because there were some test failures, we don't do this now but
   // instead preserve the old behavior.
 }
 
+bool AndroidCopyingBackingStrategy::ArePicturesOverlayable() {
+  return false;
+}
+
 }  // namespace content