Defer AVDA codec creation during reset.

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 1161 matching lines @@
     // shm block been deleted. Check that it is safe to flush the codec, i.e.
     // |pending_bitstream_records_| is empty.
     // TODO(timav): keep shm block for that buffer and remove this restriction.
     DCHECK(pending_bitstream_records_.empty());
     pending_input_buf_index_ = -1;
   }
 
   // If we've just completed a flush don't reset the codec yet. Instead defer
   // until the next decode call. This prevents us from unbacking frames that
   // might be out for display at end of stream.
-  codec_needs_reset_ = drain_type_ == DRAIN_FOR_FLUSH;
+  codec_needs_reset_ =
+      (drain_type_ == DRAIN_FOR_FLUSH) || (drain_type_ == DRAIN_FOR_RESET);
   if (codec_needs_reset_)
     return;
 
   // Flush the codec if possible, or create a new one if not.
   if (!MediaCodecUtil::CodecNeedsFlushWorkaround(media_codec_.get())) {
     DVLOG(3) << __func__ << " Flushing MediaCodec.";
     media_codec_->Flush();
     // Since we just flushed all the output buffers, make sure that nothing is
     // using them.
     picture_buffer_manager_.CodecChanged(media_codec_.get());
@@ skipping 434 matching lines @@
   if (!media_codec_)
     return;
 
   picture_buffer_manager_.CodecChanged(nullptr);
   codec_allocator_->ReleaseMediaCodec(std::move(media_codec_),
                                       codec_config_->task_type,
                                       codec_config_->surface_bundle);
 }
 
 }  // namespace media