AVDACodecImages keep their backing SurfaceTexture alive

media/gpu/avda_shared_state.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_shared_state.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
 #include "media/gpu/avda_codec_image.h"
+#include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/scoped_make_current.h"
 
 namespace media {
 
 AVDASharedState::AVDASharedState()
-    : surface_texture_service_id_(0),
-      frame_available_event_(false, false),
-      surface_texture_is_attached_(false) {}
+    : surface_texture_service_id_(0), frame_available_event_(false, false) {}
 
-AVDASharedState::~AVDASharedState() {}
+AVDASharedState::~AVDASharedState() {
+  if (!surface_texture_service_id_)
+    return;
+
+  // XXX: Does this work in all the tear down paths? Should we be using the
+  // MakeContextCurrent callback that GVDA gives us, which observes stub
+  // destruction?
+  std::unique_ptr<ui::ScopedMakeCurrent> scoped_make_current;
+  if (!context_->IsCurrent(NULL)) {
+    scoped_make_current.reset(
+        new ui::ScopedMakeCurrent(context_.get(), surface_.get()));
+  }
+  if (!scoped_make_current || scoped_make_current->Succeeded())
+    glDeleteTextures(1, &surface_texture_service_id_);
+}
 
 void AVDASharedState::SignalFrameAvailable() {
   frame_available_event_.Signal();
 }
 
 void AVDASharedState::WaitForFrameAvailable() {
   DCHECK(!release_time_.is_null());
 
   // 5msec covers >99.9% of cases, so just wait for up to that much before
   // giving up.  If an error occurs, we might not ever get a notification.
@@ skipping 15 matching lines @@
   SCOPED_UMA_HISTOGRAM_TIMER("Media.AvdaCodecImage.WaitTimeForFrame");
   if (!frame_available_event_.TimedWait(remaining)) {
     DVLOG(1) << "WaitForFrameAvailable() timed out, elapsed: "
              << elapsed.InMillisecondsF()
              << "ms, additionally waited: " << remaining.InMillisecondsF()
              << "ms, total: " << (elapsed + remaining).InMillisecondsF()
              << "ms";
   }
 }
 
-void AVDASharedState::DidAttachSurfaceTexture() {
+void AVDASharedState::SetSurfaceTexture(
+    scoped_refptr<gfx::SurfaceTexture> surface_texture,
+    GLuint attached_service_id) {
+  surface_texture_ = surface_texture;
+  surface_texture_service_id_ = attached_service_id;
   context_ = gfx::GLContext::GetCurrent();
   surface_ = gfx::GLSurface::GetCurrent();
   DCHECK(context_);
   DCHECK(surface_);
-
-  surface_texture_is_attached_ = true;
 }
 
 void AVDASharedState::CodecChanged(media::MediaCodecBridge* codec) {
   for (auto& image_kv : codec_images_)
     image_kv.second->CodecChanged(codec);
   release_time_ = base::TimeTicks();
 }
 
 void AVDASharedState::SetImageForPicture(int picture_buffer_id,
                                          AVDACodecImage* image) {
@@ skipping 16 matching lines @@
 void AVDASharedState::RenderCodecBufferToSurfaceTexture(
     media::MediaCodecBridge* codec,
     int codec_buffer_index) {
   if (!release_time_.is_null())
     WaitForFrameAvailable();
   codec->ReleaseOutputBuffer(codec_buffer_index, true);
   release_time_ = base::TimeTicks::Now();
 }
 
 }  // namespace media