Close bitstream buffer shared memory handles on Android.

media/gpu/android_video_decode_accelerator.cc

 // Copyright (c) 2013 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/android_video_decode_accelerator.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 1199 matching lines @@
 
   if (!done_cb.is_null())
     done_cb.Run();
 }
 
 void AndroidVideoDecodeAccelerator::Reset() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
   TRACE_EVENT0("media", "AVDA::Reset");
 
-  while (!pending_bitstream_buffers_.empty()) {
-    int32_t bitstream_buffer_id = pending_bitstream_buffers_.front().id();
-    pending_bitstream_buffers_.pop();
-
-    if (bitstream_buffer_id != -1) {
-      base::MessageLoop::current()->PostTask(
-          FROM_HERE,
-          base::Bind(&AndroidVideoDecodeAccelerator::NotifyEndOfBitstreamBuffer,
-                     weak_this_factory_.GetWeakPtr(), bitstream_buffer_id));
-    }
-  }
-  TRACE_COUNTER1("media", "AVDA::PendingBitstreamBufferCount", 0);
-  bitstreams_notified_in_advance_.clear();
+  ClearPendingBitstreamBuffers(NOTIFY_CLIENT);
 
   // Any error that is waiting to post can be ignored.
   error_sequence_token_++;
 
   DCHECK(strategy_);
   strategy_->ReleaseCodecBuffers(output_picture_buffers_);
 
   // Some VP8 files require complete MediaCodec drain before we can call
   // MediaCodec.flush() or MediaCodec.reset(). http://crbug.com/598963.
   if (media_codec_ && codec_config_->codec_ == media::kCodecVP8) {
@@ skipping 45 matching lines @@
 
   if (!on_destroying_surface_cb_.is_null()) {
     AVDASurfaceTracker::GetInstance()->UnregisterOnDestroyingSurfaceCallback(
         on_destroying_surface_cb_);
   }
 
   // We no longer care about |surface_id|, in case we did before.  It's okay
   // if we have no surface and/or weren't the owner or a waiter.
   g_avda_timer.Pointer()->DeallocateSurface(config_.surface_id, this);
 
+  // Clear any bitstream buffers to prevent leaked file descriptors for the
+  // shared memory, if any.
+  ClearPendingBitstreamBuffers(DONT_NOTIFY_CLIENT);
+
   // Note that async codec construction might still be in progress.  In that
   // case, the codec will be deleted when it completes once we invalidate all
   // our weak refs.
   weak_this_factory_.InvalidateWeakPtrs();
   if (media_codec_) {
     g_avda_timer.Pointer()->StopTimer(this);
     media_codec_.reset();
   }
   delete this;
 }
@@ skipping 204 matching lines @@
   } else {
     most_recent_work_ = now;
   }
 
   if (should_be_running)
     g_avda_timer.Pointer()->StartTimer(this);
   else
     g_avda_timer.Pointer()->StopTimer(this);
 }
 
+void AndroidVideoDecodeAccelerator::ClearPendingBitstreamBuffers(
+    BitstreamBufferNotificationType notify) {
+  while (!pending_bitstream_buffers_.empty()) {
+    media::BitstreamBuffer bitstream_buffer =
+        pending_bitstream_buffers_.front();
+    int32_t bitstream_buffer_id = bitstream_buffer.id();
+    pending_bitstream_buffers_.pop();
+
+    if (bitstream_buffer_id != -1) {
+      std::unique_ptr<SharedMemoryRegion> shm(
+          new SharedMemoryRegion(bitstream_buffer, true));

[watk, 2016/05/24 22:16:07]

We were thinking it might be safer to wrap the handle as soon as we enqueue it
in Decode so we can't make this mistake again. WDYT?

[liberato (no reviews please), 2016/05/24 23:19:25]

SMR is non-copyable, so i hadn't considered it.  but looking back, that makes
little sense.  we're handing around ptrs.

i'll do that instead.  thanks!

+
+      if (notify == NOTIFY_CLIENT) {
+        base::MessageLoop::current()->PostTask(
+            FROM_HERE,
+            base::Bind(
+                &AndroidVideoDecodeAccelerator::NotifyEndOfBitstreamBuffer,
+                weak_this_factory_.GetWeakPtr(), bitstream_buffer_id));
+      }
+    }
+  }
+  TRACE_COUNTER1("media", "AVDA::PendingBitstreamBufferCount", 0);
+  bitstreams_notified_in_advance_.clear();
+}
+
 // static
 bool AndroidVideoDecodeAccelerator::UseDeferredRenderingStrategy(
     const gpu::GpuPreferences& gpu_preferences) {
   // TODO(liberato, watk): Figure out what we want to do about zero copy for
   // fullscreen external SurfaceView in WebView.  http://crbug.com/582170.
   return !gpu_preferences.enable_threaded_texture_mailboxes;
 }
 
 // static
 media::VideoDecodeAccelerator::Capabilities
@@ skipping 62 matching lines @@
     if (media::MediaCodecUtil::IsSurfaceViewOutputSupported()) {
       capabilities.flags |= media::VideoDecodeAccelerator::Capabilities::
           SUPPORTS_EXTERNAL_OUTPUT_SURFACE;
     }
   }
 
   return capabilities;
 }
 
 }  // namespace media