Merge M52: "Don't reset the codec state for a flush; this kills the frames."

media/gpu/android_video_decode_accelerator.h

Index: media/gpu/android_video_decode_accelerator.h
diff --git a/media/gpu/android_video_decode_accelerator.h b/media/gpu/android_video_decode_accelerator.h
index 95a57bc0a6f898f877e7f200267f7d95bc3e0092..71567f09962a8c7ebf38a60039a9a00088947be8 100644
--- a/media/gpu/android_video_decode_accelerator.h
+++ b/media/gpu/android_video_decode_accelerator.h
@@ -450,6 +450,11 @@ class MEDIA_GPU_EXPORT AndroidVideoDecodeAccelerator
   // called NotifyInitializationComplete.
   bool deferred_initialization_pending_;
 
+  // Indicates if ResetCodecState() should be called upon the next call to
+  // Decode(). Allows us to avoid trashing the last few frames of a playback
+  // when the EOS buffer is received.
+  bool codec_needs_reset_;
+
   // Copy of the VDA::Config we were given.
   Config config_;