| Index: media/gpu/android_video_decode_accelerator.cc
|
| diff --git a/media/gpu/android_video_decode_accelerator.cc b/media/gpu/android_video_decode_accelerator.cc
|
| index 1eaeb37f4dc2763e7b96eccd1f05e29374969222..cacbfe42d23b40f7d3cdb94df0d2c59df8e4bda3 100644
|
| --- a/media/gpu/android_video_decode_accelerator.cc
|
| +++ b/media/gpu/android_video_decode_accelerator.cc
|
| @@ -1179,7 +1179,8 @@ void AndroidVideoDecodeAccelerator::ResetCodecState() {
|
| // 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;
|
|
|
|
|