muxer - flush the queued packets with wrong pts on seek

perexg · Dec 18, 2015 · 0c1406e · 0c1406e · Jalle19 · Dec 18, 2015
1 parent 016b0b3
commit 0c1406e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
@@ -165,13 +165,18 @@ bool CHTSPDemuxer::Seek
 
   htsmsg_destroy(m);
 
+  m_seeking = true;
+
   /* Wait for time */
   if (!m_seekCond.Wait(m_conn.Mutex(), m_seekTime, tvh->GetSettings().iResponseTimeout))
   {
     tvherror("failed to get subscriptionSeek response");
+    m_seeking = false;
+    Flush(); /* try to resync */
     return false;
   }
 
+  m_seeking = false;
   if (m_seekTime == INVALID_SEEKTIME)
     return false;
 
@@ -585,6 +590,7 @@ void CHTSPDemuxer::ParseSubscriptionSkip ( htsmsg_t *m )
   } else {
     m_seekTime = s64;
   }
+  Flush(); /* flush old packets (with wrong pts) */
   m_seekCond.Broadcast();
 }
 

diff --git a/src/Tvheadend.h b/src/Tvheadend.h
@@ -253,6 +253,7 @@ class CHTSPDemuxer
   std::map<int,int>                       m_streamStat;
   int64_t                                 m_seekTime;
   PLATFORM::CCondition<volatile int64_t>  m_seekCond;
+  bool                                    m_seeking;
   SSourceInfo                             m_sourceInfo;
   SQuality                                m_signalInfo;
   STimeshiftStatus                        m_timeshiftStatus;