Fix white flash at the end of playback. (popcornmix#658)

jehutting · Nov 13, 2018 · 580c93d · 580c93d
1 parent a70e9b4
commit 580c93d
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 12 deletions.
diff --git a/OMXAudio.cpp b/OMXAudio.cpp
@@ -1210,7 +1210,10 @@ bool COMXAudio::IsEOS()
   unsigned int latency = GetAudioRenderingLatency();
   CSingleLock lock (m_critSection);
 
-  if (!m_failed_eos && !(m_omx_decoder.IsEOS() && latency == 0))
+  bool hdmi_eos = ( !m_omx_render_hdmi.IsInitialized() ||  m_omx_render_hdmi.IsEOS());
+  bool analog_eos = ( !m_omx_render_analog.IsInitialized() || m_omx_render_analog.IsEOS());
+
+  if (!m_failed_eos && !(hdmi_eos && analog_eos && latency == 0))
     return false;
 
   if (m_submitted_eos)

diff --git a/OMXPlayerAudio.cpp b/OMXPlayerAudio.cpp
@@ -277,10 +277,18 @@ bool OMXPlayerAudio::Decode(OMXPacket *pkt)
 void OMXPlayerAudio::Process()
 {
   OMXPacket *omx_pkt = NULL;
+  unsigned int decoded_size = 0;
 
   while(true)
   {
     Lock();
+
+    if(decoded_size)
+    {
+      m_cached_size -= decoded_size;
+      decoded_size = 0;
+    }
+
     if(!(m_bStop || m_bAbort) && m_packets.empty())
       pthread_cond_wait(&m_packet_cond, &m_lock);
 
@@ -299,9 +307,9 @@ void OMXPlayerAudio::Process()
     else if(!omx_pkt && !m_packets.empty())
     {
       omx_pkt = m_packets.front();
-      m_cached_size -= omx_pkt->size;
       m_packets.pop_front();
-    }
+      decoded_size = 0;
+  }
     UnLock();
 
     LockDecoder();
@@ -313,6 +321,7 @@ void OMXPlayerAudio::Process()
     }
     else if(omx_pkt && Decode(omx_pkt))
     {
+      decoded_size = omx_pkt->size;
       OMXReader::FreePacket(omx_pkt);
       omx_pkt = NULL;
     }
@@ -492,12 +501,16 @@ double OMXPlayerAudio::GetCacheTotal()
 
 void OMXPlayerAudio::SubmitEOS()
 {
-  if(m_decoder)
-    m_decoder->SubmitEOS();
+  assert(m_cached_size == 0);
+  assert(m_decoder);
+  assert(m_packets.empty());
+  m_decoder->SubmitEOS();
 }
 
 bool OMXPlayerAudio::IsEOS()
 {
-  return m_packets.empty() && (!m_decoder || m_decoder->IsEOS());
+  assert(m_decoder);
+  assert(m_packets.empty());
+  return m_decoder->IsEOS();
 }
 
diff --git a/OMXPlayerVideo.cpp b/OMXPlayerVideo.cpp
@@ -225,10 +225,18 @@ bool OMXPlayerVideo::Decode(OMXPacket *pkt)
 void OMXPlayerVideo::Process()
 {
   OMXPacket *omx_pkt = NULL;
+  unsigned int decoded_size = 0;
 
   while(true)
   {
     Lock();
+
+    if(decoded_size)
+    {
+      m_cached_size -= decoded_size;
+      decoded_size = 0;
+    }
+
     if(!(m_bStop || m_bAbort) && m_packets.empty())
       pthread_cond_wait(&m_packet_cond, &m_lock);
 
@@ -247,8 +255,8 @@ void OMXPlayerVideo::Process()
     else if(!omx_pkt && !m_packets.empty())
     {
       omx_pkt = m_packets.front();
-      m_cached_size -= omx_pkt->size;
       m_packets.pop_front();
+      decoded_size = 0;
     }
     UnLock();
 
@@ -261,6 +269,7 @@ void OMXPlayerVideo::Process()
     }
     else if(omx_pkt && Decode(omx_pkt))
     {
+      decoded_size = omx_pkt->size;
       OMXReader::FreePacket(omx_pkt);
       omx_pkt = NULL;
     }
@@ -372,14 +381,17 @@ int  OMXPlayerVideo::GetDecoderFreeSpace()
 
 void OMXPlayerVideo::SubmitEOS()
 {
-  if(m_decoder)
-    m_decoder->SubmitEOS();
+  assert(m_cached_size == 0);
+  assert(m_decoder);
+  assert(m_packets.empty());
+  m_decoder->SubmitEOS();
+
 }
 
 bool OMXPlayerVideo::IsEOS()
 {
-  if(!m_decoder)
-    return false;
-  return m_packets.empty() && (!m_decoder || m_decoder->IsEOS());
+  assert(m_decoder);
+  assert(m_packets.empty());
+  return m_decoder->IsEOS();
 }