Chromium Code Reviews| 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 b821aef3230d933b4ca8ada6cd3242b041debc06..c81728d5969afde50339a696739e33983d062a55 100644 |
| --- a/media/gpu/android_video_decode_accelerator.cc |
| +++ b/media/gpu/android_video_decode_accelerator.cc |
| @@ -1268,7 +1268,8 @@ void AndroidVideoDecodeAccelerator::Reset() { |
| // Some VP8 files require complete MediaCodec drain before we can call |
| // MediaCodec.flush() or MediaCodec.reset(). http://crbug.com/598963. |
| - if (media_codec_ && codec_config_->codec_ == kCodecVP8) { |
| + if (media_codec_ && codec_config_->codec_ == kCodecVP8 && |
| + !bitstream_buffers_in_decoder_.empty()) { |
|
Tima Vaisburd
2016/06/16 23:01:34
What if the decoder stalled, i.e. no input for som
DaleCurtis
2016/06/16 23:20:47
Does it matter? I assume if the decoder has nothin
Tima Vaisburd
2016/06/16 23:47:29
If the decoder has nothing inside, we proceed to R
|
| // Postpone ResetCodecState() after the drain. |
| StartCodecDrain(DRAIN_FOR_RESET); |
| } else { |