Merge pull request #9179 from FernetMenta/comskip

VideoPlayer fix comskip

xbmc/cores/VideoPlayer/DVDMessage.cpp

@@ -82,7 +82,6 @@ bool CDVDMsgGeneralSynchronize::Wait(unsigned int milliseconds, unsigned int sou
     }
     if (timeout.IsTimePast())
     {
-      CLog::Log(LOGERROR, "CDVDMsgGeneralSynchronize - timeout");
       return false; /* request timeout, should be retried */
     }
   }

xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -2256,7 +2256,7 @@ void CVideoPlayer::CheckAutoSceneSkip()
     /*
      * Seeking is NOT flushed so any content up to the demux point is retained when playing forwards.
      */
-    m_messenger.Put(new CDVDMsgPlayerSeek(seek, true, m_omxplayer_mode, true, false, true));
+    m_messenger.Put(new CDVDMsgPlayerSeek(seek, true, false, m_omxplayer_mode, true, false, true));
     /*
      * Seek doesn't always work reliably. Last physical seek time is recorded to prevent looping
      * if there was an error with seeking and it landed somewhere unexpected, perhaps back in the
@@ -2274,7 +2274,7 @@ void CVideoPlayer::CheckAutoSceneSkip()
     /*
      * Seeking is NOT flushed so any content up to the demux point is retained when playing forwards.
      */
-    m_messenger.Put(new CDVDMsgPlayerSeek(cut.end + 1, true, m_omxplayer_mode, true, false, true));
+    m_messenger.Put(new CDVDMsgPlayerSeek(cut.end + 1, true, false, m_omxplayer_mode, true, false, true));
     /*
      * Each commercial break is only skipped once so poorly detected commercial breaks can be
      * manually re-entered. Start and end are recorded to prevent looping and to allow seeking back

xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp

@@ -209,11 +209,6 @@ void CVideoPlayerAudio::CloseStream(bool bWaitForBuffers)
 
 void CVideoPlayerAudio::OnStartup()
 {
-  m_decode.Release();
-
-#ifdef TARGET_WINDOWS
-  CoInitializeEx(NULL, COINIT_MULTITHREADED);
-#endif
 }
 
 void CVideoPlayerAudio::UpdatePlayerInfo()
@@ -317,7 +312,7 @@ void CVideoPlayerAudio::Process()
     {
       if (m_pAudioCodec)
         m_pAudioCodec->Reset();
-      m_decode.Release();
+      m_syncState = IDVDStreamPlayer::SYNC_STARTING;
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_FLUSH))
     {
@@ -334,8 +329,6 @@ void CVideoPlayerAudio::Process()
 
       if (m_pAudioCodec)
         m_pAudioCodec->Reset();
-
-      m_decode.Release();
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_EOF))
     {

xbmc/cores/VideoPlayer/VideoPlayerAudio.h

@@ -94,47 +94,6 @@ class CVideoPlayerAudio : public CThread, public IDVDStreamPlayerAudio
 
   double m_audioClock;
 
-  // data for audio decoding
-  struct PacketStatus
-  {
-    PacketStatus()
-    {
-        msg = NULL;
-        Release();
-    }
-
-   ~PacketStatus()
-    {
-        Release();
-    }
-
-    CDVDMsgDemuxerPacket* msg;
-    uint8_t* data;
-    int size;
-    double dts;
-    double pts;
-
-    void Attach(CDVDMsgDemuxerPacket* msg2)
-    {
-      if(msg) msg->Release();
-      msg = msg2;
-      msg->Acquire();
-      DemuxPacket* p = msg->GetPacket();
-      data = p->pData;
-      size = p->iSize;
-      dts = p->dts;
-      pts = p->pts;
-    }
-    void Release()
-    {
-      if(msg) msg->Release();
-      msg  = NULL;
-      data = NULL;
-      size = 0;
-      dts  = DVD_NOPTS_VALUE;
-    }
-  } m_decode;
-
   CDVDAudio m_dvdAudio; // audio output device
   CDVDClock* m_pClock; // dvd master clock
   CDVDAudioCodec* m_pAudioCodec; // audio codec

xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp

@@ -101,6 +101,7 @@ CVideoPlayerVideo::CVideoPlayerVideo(CDVDClock* pClock
 
 CVideoPlayerVideo::~CVideoPlayerVideo()
 {
+  m_bAbortOutput = true;
   StopThread();
   g_VideoReferenceClock.Stop();
 }
@@ -207,7 +208,8 @@ void CVideoPlayerVideo::CloseStream(bool bWaitForBuffers)
   // wait for decode_video thread to end
   CLog::Log(LOGNOTICE, "waiting for video thread to exit");
 
-  StopThread(); // will set this->m_bStop to true
+  m_bAbortOutput = true;
+  StopThread();
 
   m_messageQueue.End();
 
@@ -335,6 +337,7 @@ void CVideoPlayerVideo::Process()
       m_picture.iFlags &= ~DVP_FLAG_ALLOCATED;
       m_packets.clear();
       m_droppingStats.Reset();
+      m_syncState = IDVDStreamPlayer::SYNC_STARTING;
     }
     else if (pMsg->IsType(CDVDMsg::GENERAL_FLUSH)) // private message sent by (CVideoPlayerVideo::Flush())
     {
@@ -695,6 +698,7 @@ void CVideoPlayerVideo::Flush(bool sync)
   /* be disposed of before we flush */
   m_messageQueue.Flush();
   m_messageQueue.Put(new CDVDMsgBool(CDVDMsg::GENERAL_FLUSH, sync), 1);
+  m_bAbortOutput = true;
 }
 
 #ifdef HAS_VIDEO_PLAYBACK
@@ -763,6 +767,8 @@ std::string CVideoPlayerVideo::GetStereoMode()
 
 int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
 {
+  m_bAbortOutput = false;
+
   /* picture buffer is not allowed to be modified in this call */
   DVDVideoPicture picture(*src);
   DVDVideoPicture* pPicture = &picture;
@@ -929,7 +935,7 @@ int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
   // don't wait when going ff
   if (m_speed > DVD_PLAYSPEED_NORMAL)
     maxWaitTime = std::max(DVD_TIME_TO_MSEC(iSleepTime), 0);
-  int buffer = m_renderManager.WaitForBuffer(m_bStop, maxWaitTime);
+  int buffer = m_renderManager.WaitForBuffer(m_bAbortOutput, maxWaitTime);
   if (buffer < 0)
   {
     m_droppingStats.AddOutputDropGain(pts, 1/m_fFrameRate);
@@ -941,7 +947,7 @@ int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
   int index = m_renderManager.AddVideoPicture(*pPicture);
 
   // video device might not be done yet
-  while (index < 0 && !CThread::m_bStop &&
+  while (index < 0 && !m_bAbortOutput &&
          CDVDClock::GetAbsoluteClock(false) < iCurrentClock + iSleepTime + DVD_MSEC_TO_TIME(500) )
   {
     Sleep(1);
@@ -954,7 +960,7 @@ int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
     return EOS_DROPPED;
   }
 
-  m_renderManager.FlipPage(CThread::m_bStop, (iCurrentClock + iSleepTime) / DVD_TIME_BASE, pts_org, -1, mDisplayField);
+  m_renderManager.FlipPage(m_bAbortOutput, (iCurrentClock + iSleepTime) / DVD_TIME_BASE, pts_org, -1, mDisplayField);
 
   return result;
 }

xbmc/cores/VideoPlayer/VideoPlayerVideo.h

@@ -27,10 +27,9 @@
 #include "DVDClock.h"
 #include "DVDOverlayContainer.h"
 #include "DVDTSCorrection.h"
-#ifdef HAS_VIDEO_PLAYBACK
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
-#endif
 #include "utils/BitstreamStats.h"
+#include <atomic>
 
 class CDemuxStreamVideo;
 
@@ -147,6 +146,7 @@ class CVideoPlayerVideo : public CThread, public IDVDStreamPlayerVideo
   bool m_stalled;
   IDVDStreamPlayer::ESyncState m_syncState;
   std::string m_codecname;
+  std::atomic_bool m_bAbortOutput;
 
   BitstreamStats m_videoStats;
 

xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp

@@ -907,7 +907,7 @@ void CRenderManager::SetViewMode(int iViewMode)
   m_playerPort->VideoParamsChange();
 }
 
-void CRenderManager::FlipPage(volatile bool& bStop, double timestamp /* = 0LL*/, double pts /* = 0 */, int source /*= -1*/, EFIELDSYNC sync /*= FS_NONE*/)
+void CRenderManager::FlipPage(volatile std::atomic_bool& bStop, double timestamp /* = 0LL*/, double pts /* = 0 */, int source /*= -1*/, EFIELDSYNC sync /*= FS_NONE*/)
 {
   { CSingleLock lock(m_statelock);
 
@@ -1310,7 +1310,7 @@ EINTERLACEMETHOD CRenderManager::AutoInterlaceMethodInternal(EINTERLACEMETHOD mI
   return mInt;
 }
 
-int CRenderManager::WaitForBuffer(volatile bool& bStop, int timeout)
+int CRenderManager::WaitForBuffer(volatile std::atomic_bool&bStop, int timeout)
 {
   CSingleLock lock(m_presentlock);
 

xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.h

@@ -31,6 +31,7 @@
 #include "OverlayRenderer.h"
 #include <deque>
 #include <map>
+#include <atomic>
 #include "PlatformDefs.h"
 #include "threads/Event.h"
 #include "DVDClock.h"
@@ -127,7 +128,7 @@ class CRenderManager
    * @param source depreciated
    * @param sync signals frame, top, or bottom field
    */
-  void FlipPage(volatile bool& bStop, double timestamp = 0.0, double pts = 0.0, int source = -1, EFIELDSYNC sync = FS_NONE);
+  void FlipPage(volatile std::atomic_bool& bStop, double timestamp = 0.0, double pts = 0.0, int source = -1, EFIELDSYNC sync = FS_NONE);
 
   void AddOverlay(CDVDOverlay* o, double pts);
 
@@ -142,7 +143,7 @@ class CRenderManager
    * If no buffering is requested in Configure, player does not need to call this,
    * because FlipPage will block.
    */
-  int WaitForBuffer(volatile bool& bStop, int timeout = 100);
+  int WaitForBuffer(volatile std::atomic_bool& bStop, int timeout = 100);
 
   /**
    * Can be called by player for lateness detection. This is done best by

xbmc/cores/omxplayer/OMXPlayerVideo.cpp

@@ -166,7 +166,10 @@ void OMXPlayerVideo::CloseStream(bool bWaitForBuffers)
   m_messageQueue.Abort();
 
   if(IsRunning())
+  {
+    m_bAbortOutput = true;
     StopThread();
+  }
 
   m_messageQueue.End();
 
@@ -301,7 +304,8 @@ void OMXPlayerVideo::Output(double pts, bool bDropPacket)
   if (m_nextOverlay != DVD_NOPTS_VALUE && media_pts != 0.0 && media_pts + preroll <= m_nextOverlay)
     return;
 
-  int buffer = m_renderManager.WaitForBuffer(CThread::m_bStop);
+  m_bAbortOutput = false;
+  int buffer = m_renderManager.WaitForBuffer(m_bAbortOutput);
   if (buffer < 0)
     return;
 
@@ -313,7 +317,7 @@ void OMXPlayerVideo::Output(double pts, bool bDropPacket)
   ProcessOverlays(media_pts + preroll);
 
   time += m_av_clock->GetAbsoluteClock();
-  m_renderManager.FlipPage(CThread::m_bStop, time/DVD_TIME_BASE);
+  m_renderManager.FlipPage(m_bAbortOutput, time/DVD_TIME_BASE);
 }
 
 void OMXPlayerVideo::Process()
@@ -506,6 +510,7 @@ void OMXPlayerVideo::Flush(bool sync)
   m_messageQueue.Flush();
   m_messageQueue.Flush(CDVDMsg::GENERAL_EOF);
   m_messageQueue.Put(new CDVDMsgBool(CDVDMsg::GENERAL_FLUSH, sync), 1);
+  m_bAbortOutput = true;
 }
 
 bool OMXPlayerVideo::OpenDecoder()

xbmc/cores/omxplayer/OMXPlayerVideo.h

@@ -36,6 +36,7 @@
 #include "utils/BitstreamStats.h"
 #include "linux/DllBCM.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
+#include <atomic>
 
 class OMXPlayerVideo : public CThread, public IDVDStreamPlayerVideo
 {
@@ -57,6 +58,7 @@ class OMXPlayerVideo : public CThread, public IDVDStreamPlayerVideo
   bool                      m_sync;
   bool                      m_flush;
   std::string               m_codecname;
+  std::atomic_bool          m_bAbortOutput;
   double                    m_iSubtitleDelay;
   bool                      m_bRenderSubs;
   bool                      m_bAllowFullscreen;