From 442208b433cc7a9680b0d720753b1de79ca7d3c6 Mon Sep 17 00:00:00 2001 From: peak3d Date: Sat, 6 Jun 2020 10:23:55 +0200 Subject: [PATCH] [Backport][Android] Fix stall on stream end --- .../DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp index e4661e33977f6..691a44e8b2a30 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp @@ -1036,7 +1036,8 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecAndroidMediaCodec::GetPicture(VideoPictur if (!m_opened) return VC_NONE; - if (m_state == MEDIACODEC_STATE_RUNNING && (m_OutputDuration < m_fpsDuration || (m_codecControlFlags & DVD_CODEC_CTRL_DRAIN)!=0)) + if (m_state != MEDIACODEC_STATE_FLUSHED && + (m_OutputDuration < m_fpsDuration || (m_codecControlFlags & DVD_CODEC_CTRL_DRAIN) != 0)) { m_videobuffer.videoBuffer = pVideoPicture->videoBuffer;