Added SurfaceTextureGLOwner to create / own GL objects.

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"
@@ skipping 44 matching lines @@
   // Protects changes to listener_.
   base::Lock lock_;
 
   // The AVDASharedState that wants the OnFrameAvailable callback.
   AVDASharedState* listener_;
 
   DISALLOW_COPY_AND_ASSIGN(OnFrameAvailableHandler);
 };
 
 AVDASharedState::AVDASharedState()
-    : surface_texture_service_id_(0),
-      frame_available_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
+    : frame_available_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                              base::WaitableEvent::InitialState::NOT_SIGNALED),
 
       gl_matrix_{
           1, 0, 0, 0,  // Default to a sane guess just in case we can't get the
           0, 1, 0, 0,  // matrix on the first call. Will be Y-flipped later.
           0, 0, 1, 0,  //
           0, 0, 0, 1,  // Comment preserves 4x4 formatting.
       } {}
 
 AVDASharedState::~AVDASharedState() {
-  if (!surface_texture_service_id_)
+  if (!surface_texture_)
     return;
 
   on_frame_available_handler_->ClearListener();
-  ui::ScopedMakeCurrent scoped_make_current(context_.get(), surface_.get());
-  if (scoped_make_current.Succeeded()) {
-    glDeleteTextures(1, &surface_texture_service_id_);
-    DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
-  }
 }
 
 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
@@ skipping 17 matching lines @@
   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::SetSurfaceTexture(
-    scoped_refptr<gl::SurfaceTexture> surface_texture,
-    GLuint attached_service_id) {
+    scoped_refptr<SurfaceTextureGLOwner> surface_texture) {
   DCHECK(surface_texture);
-  DCHECK(attached_service_id);
   surface_texture_ = surface_texture;
-  surface_texture_service_id_ = attached_service_id;
-  context_ = gl::GLContext::GetCurrent();
-  surface_ = gl::GLSurface::GetCurrent();
-  DCHECK(context_);
-  DCHECK(surface_);
   on_frame_available_handler_ =
       new OnFrameAvailableHandler(this, surface_texture_.get());
 }
 
 void AVDASharedState::RenderCodecBufferToSurfaceTexture(
     MediaCodecBridge* codec,
     int codec_buffer_index) {
   if (!release_time_.is_null())
     WaitForFrameAvailable();
   codec->ReleaseOutputBuffer(codec_buffer_index, true);
   release_time_ = base::TimeTicks::Now();
 }
 
 void AVDASharedState::UpdateTexImage() {
   surface_texture_->UpdateTexImage();
   // Helpfully, this is already column major.
   surface_texture_->GetTransformMatrix(gl_matrix_);
 }
 
 void AVDASharedState::GetTransformMatrix(float matrix[16]) const {
   memcpy(matrix, gl_matrix_, sizeof(gl_matrix_));
 }
 
 }  // namespace media