Use MediaCodec.setOutputSurface() for fullscreen transitions on M.

media/gpu/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 "media/gpu/avda_codec_image.h"
 
 #include <string.h>
 
 #include <memory>
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "media/base/android/sdk_media_codec_bridge.h"
 #include "media/gpu/avda_shared_state.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/scoped_make_current.h"
 
 namespace media {
 
 AVDACodecImage::AVDACodecImage(
-    int picture_buffer_id,
     const scoped_refptr<AVDASharedState>& shared_state,
     VideoCodecBridge* codec,
     const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder)
     : shared_state_(shared_state),
       codec_buffer_index_(kInvalidCodecBufferIndex),
       media_codec_(codec),
       decoder_(decoder),
-      has_surface_texture_(!!shared_state_->surface_texture_service_id()),
-      texture_(0),
-      picture_buffer_id_(picture_buffer_id) {
-  shared_state_->SetImageForPicture(picture_buffer_id_, this);
-}
+      has_surface_texture_(false),
+      texture_(0) {}
 
-AVDACodecImage::~AVDACodecImage() {
-  shared_state_->SetImageForPicture(picture_buffer_id_, nullptr);
-}
+AVDACodecImage::~AVDACodecImage() {}
 
 gfx::Size AVDACodecImage::GetSize() {
   return size_;
 }
 
 unsigned AVDACodecImage::GetInternalFormat() {
   return GL_RGBA;
 }
 
 bool AVDACodecImage::BindTexImage(unsigned target) {
   return false;
 }
 
 void AVDACodecImage::ReleaseTexImage(unsigned target) {}
 
 bool AVDACodecImage::CopyTexImage(unsigned target) {
   if (!has_surface_texture_)
     return false;
 
   if (target != GL_TEXTURE_EXTERNAL_OES)
     return false;
 
-  GLint bound_service_id = 0;
-  glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, &bound_service_id);
-  // We insist that the currently bound texture is the right one.
-  if (bound_service_id !=
-      static_cast<GLint>(shared_state_->surface_texture_service_id())) {
-    return false;
-  }
+  // GLint bound_service_id = 0;

[liberato (no reviews please), 2016/11/03 20:51:04]

now that we're swapping out |shared_state_| when setting up a picture for a new
frame, how does it get into this situation?

[DaleCurtis, 2016/11/04 01:07:22]

Just left over testing. Removed.

+  // glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, &bound_service_id);
+  // // We insist that the currently bound texture is the right one.
+  // if (bound_service_id !=
+  //     static_cast<GLint>(shared_state_->surface_texture_service_id())) {
+  //   return false;
+  // }
 
   // Make sure that we have the right image in the front buffer.  Note that the
   // bound_service_id is guaranteed to be equal to the surface texture's client
   // texture id, so we can skip preserving it if the right context is current.
   UpdateSurfaceInternal(UpdateMode::RENDER_TO_FRONT_BUFFER,
                         kDontRestoreBindings);
 
   // 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
@@ skipping 56 matching lines @@
 
 void AVDACodecImage::UpdateSurface(UpdateMode update_mode) {
   UpdateSurfaceInternal(update_mode, kDoRestoreBindings);
 }
 
 void AVDACodecImage::CodecChanged(MediaCodecBridge* codec) {
   media_codec_ = codec;
   codec_buffer_index_ = kInvalidCodecBufferIndex;
 }
 
+void AVDACodecImage::SetBufferMetadata(int buffer_index,
+                                       bool has_surface_texture,
+                                       const gfx::Size size) {
+  has_surface_texture_ = has_surface_texture;
+  codec_buffer_index_ = buffer_index;
+  size_ = size;
+}
+
+bool AVDACodecImage::SetSharedState(
+    const scoped_refptr<AVDASharedState>& shared_state) {
+  if (shared_state == shared_state_)
+    return false;
+  shared_state_ = shared_state;
+  return true;
+}
+
 void AVDACodecImage::UpdateSurfaceInternal(
     UpdateMode update_mode,
     RestoreBindingsMode attached_bindings_mode) {
   if (!IsCodecBufferOutstanding())
     return;
 
   ReleaseOutputBuffer(update_mode);
 
   // SurfaceViews are updated implicitly, so no further steps are necessary.
   if (!has_surface_texture_) {
@@ skipping 70 matching lines @@
 }
 
 bool AVDACodecImage::IsCodecBufferOutstanding() const {
   static_assert(kUpdateOnly < 0 && kUpdateOnly > kRendered &&
                     kRendered > kInvalidCodecBufferIndex,
                 "Codec buffer index enum values are not ordered correctly.");
   return codec_buffer_index_ > kRendered && media_codec_;
 }
 
 }  // namespace media