Drop idle MediaCodec instances after a few seconds within AVDA.

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 945 matching lines @@
   NotifyPictureReady(picture);
 
   // Connect the PictureBuffer to the decoded frame, via whatever mechanism the
   // strategy likes.
   strategy_->UseCodecBufferForPictureBuffer(codec_buffer_index, i->second);
 }
 
 void AndroidVideoDecodeAccelerator::Decode(
     const BitstreamBuffer& bitstream_buffer) {
   DCHECK(thread_checker_.CalledOnValidThread());
+  no_decode_timeout_.Stop();

[liberato (no reviews please), 2016/07/13 05:25:55]

i think that you also need to stop the timer in ReleaseMediaCodec.

for example, if the timer fires while async codec config is pending, then we
don't want to take any action.

[DaleCurtis, 2016/07/13 21:12:21]

Done.

 
   // If we previously deferred a codec restart, take care of it now. This can
   // happen on older devices where configuration changes require a codec reset.
   if (codec_needs_reset_) {
     DCHECK_EQ(drain_type_, DRAIN_TYPE_NONE);
     ResetCodecState();
   }
 
   if (bitstream_buffer.id() >= 0 && bitstream_buffer.size() > 0) {
     DecodeBuffer(bitstream_buffer);
@@ skipping 219 matching lines @@
 
   DCHECK(!media_codec_);
   media_codec_ = std::move(media_codec);
   strategy_->CodecChanged(media_codec_.get());
   if (!media_codec_) {
     POST_ERROR(PLATFORM_FAILURE, "Failed to create MediaCodec.");
     return;
   }
 
   state_ = NO_ERROR;
-
+  no_decode_timeout_.Start(FROM_HERE, base::TimeDelta::FromSeconds(2), this,

[liberato (no reviews please), 2016/07/13 05:25:55]

2 => kSomethingSomething

[DaleCurtis, 2016/07/13 21:12:21]

Done.

+                           &AndroidVideoDecodeAccelerator::CloseIdleCodec);
   ManageTimer(true);
 }
 
 void AndroidVideoDecodeAccelerator::StartCodecDrain(DrainType drain_type) {
   DVLOG(2) << __FUNCTION__ << " drain_type:" << drain_type;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // We assume that DRAIN_FOR_FLUSH and DRAIN_FOR_RESET cannot come while
   // another drain request is present, but DRAIN_FOR_DESTROY can.
   DCHECK_NE(drain_type, DRAIN_TYPE_NONE);
@@ skipping 88 matching lines @@
   // state because of a codec error, then it would be okay.  Otherwise, it's
   // less obvious that we are exiting the error state.  Since deferred errors
   // are only intended for fullscreen transitions right now, we take the more
   // conservative approach and let the errors post.
   // TODO(liberato): revisit this once we sort out the error state a bit more.
 
   // When the codec is not in error state we can flush() for JB-MR2 and beyond.
   // Prior to JB-MR2, flush() had several bugs (b/8125974, b/8347958) so we must
   // delete the MediaCodec and create a new one. The full reconfigure is much
   // slower and may cause visible freezing if done mid-stream.
-  if (!did_codec_error_happen &&
+  if (!did_codec_error_happen && media_codec_ &&
       base::android::BuildInfo::GetInstance()->sdk_int() >= 18) {
     DVLOG(3) << __FUNCTION__ << " Flushing MediaCodec.";
     media_codec_->Flush();
     // Since we just flushed all the output buffers, make sure that nothing is
     // using them.
     strategy_->CodecChanged(media_codec_.get());
   } else {
     DVLOG(3) << __FUNCTION__
              << " Deleting the MediaCodec and creating a new one.";
     g_avda_timer.Pointer()->StopTimer(this);
@@ skipping 454 matching lines @@
 }
 
 bool AndroidVideoDecodeAccelerator::IsMediaCodecSoftwareDecodingForbidden()
     const {
   // Prevent MediaCodec from using its internal software decoders when we have
   // more secure and up to date versions in the renderer process.
   return !config_.is_encrypted && (codec_config_->codec_ == media::kCodecVP8 ||
                                    codec_config_->codec_ == media::kCodecVP9);
 }
 
+void AndroidVideoDecodeAccelerator::CloseIdleCodec() {
+  if (media_codec_) {

[liberato (no reviews please), 2016/07/13 05:25:55]

please consider early out.

[DaleCurtis, 2016/07/13 21:12:21]

Done.

+    ReleaseMediaCodec();
+    codec_needs_reset_ = true;
+  }
+}
+
 }  // namespace media