media: Ensure MediaCodecs are released before attached SurfaceTextures

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 63 matching lines @@
 }  // namespace
 
 AVDAPictureBufferManager::AVDAPictureBufferManager(
     AVDAStateProvider* state_provider)
     : state_provider_(state_provider), media_codec_(nullptr) {}
 
 AVDAPictureBufferManager::~AVDAPictureBufferManager() {}
 
 gl::ScopedJavaSurface AVDAPictureBufferManager::Initialize(int surface_id) {
   shared_state_ = new AVDASharedState();
+  surface_texture_ = nullptr;
 
   // Acquire the SurfaceView surface if given a valid id.
-  if (surface_id != SurfaceManager::kNoSurfaceID) {
-    if (surface_texture_) {
-      surface_texture_->ReleaseSurfaceTexture();
-      surface_texture_ = nullptr;
-    }
+  if (surface_id != SurfaceManager::kNoSurfaceID)
     return gpu::GpuSurfaceLookup::GetInstance()->AcquireJavaSurface(surface_id);
-  }
 
   // Otherwise create a SurfaceTexture.
   GLuint service_id;
   surface_texture_ = CreateAttachedSurfaceTexture(
       state_provider_->GetGlDecoder(), &service_id);
   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;
 
   ReleaseCodecBuffers(buffers);
   CodecChanged(nullptr);
-
-  // Release the surface texture and any back buffers.  This will preserve the
-  // front buffer, if any.
-  if (surface_texture_)
-    surface_texture_->ReleaseSurfaceTexture();
+  surface_texture_ = nullptr;
 }
 
 void AVDAPictureBufferManager::SetImageForPicture(
     const PictureBuffer& picture_buffer,
     gpu::gles2::GLStreamTextureImage* image) {
   auto gles_decoder = state_provider_->GetGlDecoder();
   RETURN_IF_NULL(gles_decoder);
   auto* context_group = gles_decoder->GetContextGroup();
   RETURN_IF_NULL(context_group);
   auto* texture_manager = context_group->texture_manager();
@@ skipping 168 matching lines @@
 
 bool AVDAPictureBufferManager::HasUnrenderedPictures() const {
   for (int id : pictures_out_for_display_) {
     if (GetImageForPicture(id)->is_unrendered())
       return true;
   }
   return false;
 }
 
 }  // namespace media