media: Ensure MediaCodecs are released before attached SurfaceTextures

media/gpu/avda_codec_allocator.h

Index: media/gpu/avda_codec_allocator.h
diff --git a/media/gpu/avda_codec_allocator.h b/media/gpu/avda_codec_allocator.h
index 180a91acb1e4fd762c772be808def655420f64e8..8cfb4b0f1b42181d511408e79bea6b81ee78f492 100644
--- a/media/gpu/avda_codec_allocator.h
+++ b/media/gpu/avda_codec_allocator.h
@@ -54,6 +54,10 @@ class CodecConfig : public base::RefCountedThreadSafe<CodecConfig> {
   gl::ScopedJavaSurface surface;
   int surface_id = SurfaceManager::kNoSurfaceID;
 
+  // The SurfaceTexture attached to |surface|, or nullptr if |surface| is
+  // SurfaceView backed.
+  scoped_refptr<gl::SurfaceTexture> surface_texture;

[liberato (no reviews please), 2017/01/17 18:58:24]

is this used?

[watk, 2017/01/17 19:02:48]

Yes, I put a comment on its usage. The point of it is to keep a strong ref to
the ST that is independent of anything else using it, so we don't have to worry
about ~ST doing the release before we release the codec, and we don't have to
give PBM a weird guarantee about how long it holds onto the ST.

+
   // The MediaCrypto that MediaCodec is configured with for an encrypted stream.
   MediaDrmBridgeCdmContext::JavaObjectPtr media_crypto;
 
@@ -160,6 +164,9 @@ class MEDIA_GPU_EXPORT AVDACodecAllocator {
   // both threads are hung.
   base::Optional<TaskType> TaskTypeForAllocation();
 
+  // Return the task runner for tasks of type |type|.
+  scoped_refptr<base::SingleThreadTaskRunner> TaskRunnerFor(TaskType task_type);
+
   // Return a reference to the thread for unit tests.
   base::Thread& GetThreadForTesting(TaskType task_type);
 
@@ -203,9 +210,6 @@ class MEDIA_GPU_EXPORT AVDACodecAllocator {
                      base::WaitableEvent* stop_event = nullptr);
   ~AVDACodecAllocator();
 
-  // Return the task runner for tasks of type |type|.
-  scoped_refptr<base::SingleThreadTaskRunner> TaskRunnerFor(TaskType task_type);
-
   void OnMediaCodecAndSurfaceReleased(int surface_id);
 
   // Stop the thread indicated by |index|. This signals stop_event_for_testing_