Pass SubmitEOS message through decode queue

So, the problem is that SubmitEOS is called when demuxer reaches end of file, but not all the encoded frames have been submitted to decoder.

m_packets may contain dozens of encoded frames of data at the point SubmitEOS is called. We want those to all be submitted to decoder before the SubmitEOS is called.

Author: popcornmix

OMXPlayerAudio.cpp

@@ -299,7 +299,15 @@ void OMXPlayerAudio::Process()
     else if(!omx_pkt && !m_packets.empty())
     {
       omx_pkt = m_packets.front();
-      m_cached_size -= omx_pkt->size;
+      if (omx_pkt)
+      {
+        m_cached_size -= omx_pkt->size;
+      }
+      else
+      {
+        assert(m_cached_size == 0);
+        SubmitEOSInternal();
+      }
       m_packets.pop_front();
     }
     UnLock();
@@ -491,6 +499,14 @@ double OMXPlayerAudio::GetCacheTotal()
 }
 
 void OMXPlayerAudio::SubmitEOS()
+{
+  Lock();
+  m_packets.push_back(nullptr);
+  UnLock();
+  pthread_cond_broadcast(&m_packet_cond);
+}
+
+void OMXPlayerAudio::SubmitEOSInternal()
 {
   if(m_decoder)
     m_decoder->SubmitEOS();

OMXPlayerAudio.h

@@ -101,6 +101,7 @@ class OMXPlayerAudio : public OMXThread
   double GetCacheTotal();
   double GetCurrentPTS() { return m_iCurrentPts; };
   void SubmitEOS();
+  void SubmitEOSInternal();
   bool IsEOS();
   unsigned int GetCached() { return m_cached_size; };
   unsigned int GetMaxCached() { return m_config.queue_size * 1024 * 1024; };

OMXPlayerVideo.cpp

@@ -247,7 +247,15 @@ void OMXPlayerVideo::Process()
     else if(!omx_pkt && !m_packets.empty())
     {
       omx_pkt = m_packets.front();
-      m_cached_size -= omx_pkt->size;
+      if (omx_pkt)
+      {
+        m_cached_size -= omx_pkt->size;
+      }
+      else
+      {
+        assert(m_cached_size == 0);
+        SubmitEOSInternal();
+      }
       m_packets.pop_front();
     }
     UnLock();
@@ -371,6 +379,14 @@ int  OMXPlayerVideo::GetDecoderFreeSpace()
 }
 
 void OMXPlayerVideo::SubmitEOS()
+{
+  Lock();
+  m_packets.push_back(nullptr);
+  UnLock();
+  pthread_cond_broadcast(&m_packet_cond);
+}
+
+void OMXPlayerVideo::SubmitEOSInternal()
 {
   if(m_decoder)
     m_decoder->SubmitEOS();

OMXPlayerVideo.h

@@ -92,6 +92,7 @@ class OMXPlayerVideo : public OMXThread
   unsigned int GetMaxCached() { return m_config.queue_size * 1024 * 1024; };
   unsigned int GetLevel() { return m_config.queue_size ? 100.0f * m_cached_size / (m_config.queue_size * 1024.0f * 1024.0f) : 0; };
   void SubmitEOS();
+  void SubmitEOSInternal();
   bool IsEOS();
   void SetDelay(double delay) { m_iVideoDelay = delay; }
   double GetDelay() { return m_iVideoDelay; }