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

media/gpu/avda_picture_buffer_manager.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_picture_buffer_manager.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 #include "base/android/build_info.h"
@@ skipping 136 matching lines @@
   surface_texture_ = CreateAttachedSurfaceTexture(
       state_provider_->GetGlDecoder(), &service_id);
   if (surface_texture_) {
     on_frame_available_handler_ = new OnFrameAvailableHandler(
         shared_state_.get(), surface_texture_.get());
   }
   shared_state_->SetSurfaceTexture(surface_texture_, service_id);
   return gl::ScopedJavaSurface(surface_texture_.get());
 }
 
+gl::ScopedJavaSurface AVDAPictureBufferManager::SetSurface(int surface_id) {
+  // Acquire the SurfaceView surface if given a valid id.
+  if (surface_id != VideoDecodeAccelerator::Config::kNoSurfaceID) {
+    shared_state_->SetSurfaceTexture(nullptr, 0);
+    on_frame_available_handler_ = nullptr;
+    surface_texture_ = nullptr;
+    return gpu::GpuSurfaceLookup::GetInstance()->AcquireJavaSurface(surface_id);
+  }
+
+  // Otherwise create a SurfaceTexture.
+  GLuint service_id = 0;
+  surface_texture_ = CreateAttachedSurfaceTexture(
+      state_provider_->GetGlDecoder(), &service_id);
+  if (surface_texture_) {
+    on_frame_available_handler_ = new OnFrameAvailableHandler(

[liberato (no reviews please), 2016/11/01 20:57:16]

it was probably using the old |service_id| in the GLImages.  when the codec
images are attached in AVDAPictureBufferManager::SetImageForPicture, the call to
SetLevelStreamTextureImage provides |service_id|.  One can update it later by
calling Texture::SetStreamTextureServiceId.  it should be safe to do so here.

also, one must be sure to delete the outgoing |service_id| after that.  since
the last frame was still visible, i suspect that it wasn't being deleted. 
~SharedState takes care of this normally.

[DaleCurtis, 2016/11/03 19:32:36]

Thanks for this! The latest patch set uses this method, but needed to make that
method public first.

+        shared_state_.get(), surface_texture_.get());
+  }
+  shared_state_->SetSurfaceTexture(surface_texture_, service_id);
+  return gl::ScopedJavaSurface(surface_texture_.get());
+}
+
 void AVDAPictureBufferManager::Destroy(const PictureBufferMap& buffers) {
   // Do nothing if Initialize() has not been called.
   if (!shared_state_)
     return;
 
   // If we have an OnFrameAvailable handler, tell it that we no longer want
   // callbacks.
   if (on_frame_available_handler_)
     on_frame_available_handler_->ClearListener();
 
@@ skipping 226 matching lines @@
   shared_state_->CodecChanged(codec);
 }
 
 bool AVDAPictureBufferManager::ArePicturesOverlayable() {
   // SurfaceView frames are always overlayable because that's the only way to
   // display them.
   return !surface_texture_;
 }
 
 }  // namespace media