Release MediaCodec on another thread more often.

media/gpu/android_video_decode_accelerator.h

 // 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.
 
 #ifndef MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 308 matching lines @@
   // from breaking.  NotifyError will do so immediately, PostError may wait.
   // |token| has to match |error_sequence_token_|, or else it's assumed to be
   // from a post that's prior to a previous reset, and ignored.
   void NotifyError(VideoDecodeAccelerator::Error error, int token);
 
   // Start or stop our work-polling timer based on whether we did any work, and
   // how long it has been since we've done work.  Calling this with true will
   // start the timer.  Calling it with false may stop the timer.
   void ManageTimer(bool did_work);
 
+  // Safely clear |media_codec_|.  Do this instead of calling reset() / assign.
+  // Otherwise, the destructor can hang if mediaserver is in a bad state.  This
+  // will release immediately if safe, else post to a separate thread.  Either
+  // way, |media_codec_| will be null upon return.
+  void ReleaseMediaCodec();
+
   // Start the MediaCodec drain process by adding end_of_stream() buffer to the
   // encoded buffers queue. When we receive EOS from the output buffer the drain
   // process completes and we perform the action depending on the |drain_type|.
   void StartCodecDrain(DrainType drain_type);
 
   // Returns true if we are currently draining the codec and doing that as part
   // of Reset() or Destroy() VP8 workaround. (http://crbug.com/598963). We won't
   // display any frames and disable normal errors handling.
   bool IsDrainingForResetOrDestroy() const;
 
@@ skipping 137 matching lines @@
 
   // WeakPtrFactory for posting tasks back to |this|.
   base::WeakPtrFactory<AndroidVideoDecodeAccelerator> weak_this_factory_;
 
   friend class AndroidVideoDecodeAcceleratorTest;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_