Merge pull request #1907 from CastagnaIT/segmented_subs_fix

[SubtitleSampleReader] Fix packet pts

Author: CastagnaIT

src/Session.cpp

@@ -966,7 +966,7 @@ bool SESSION::CSession::SeekTime(double seekTime, unsigned int streamId, bool pr
 
       streamReader->SetPTSDiff(ptsDiff);
 
-      double seekSecs{static_cast<double>(seekTimeCorrected - streamReader->GetPTSDiff()) /
+      double seekSecs{static_cast<double>(seekTimeCorrected - ptsDiff) /
                       STREAM_TIME_BASE};
       if (stream->m_adStream.seek_time(seekSecs, preceeding, reset))
       {

src/samplereader/SubtitleSampleReader.cpp

@@ -187,10 +187,6 @@ AP4_Result CSubtitleSampleReader::ReadSample()
       // Wait for manifest live update to get next segment
       return AP4_SUCCESS;
     }
-    else
-    {
-      LOG::LogF(LOGERROR, "Failed to get segment data from subtitle stream");
-    }
   }
 
   m_eos = true;
@@ -204,6 +200,7 @@ void CSubtitleSampleReader::Reset(bool bEOS)
     m_sampleData.SetDataSize(0);
     m_eos = bEOS;
     m_codecHandler->Reset();
+    m_pts = 0;
   }
 }
 
@@ -223,7 +220,6 @@ bool CSubtitleSampleReader::TimeSeek(uint64_t pts, bool preceeding)
 {
   if (dynamic_cast<WebVTTCodecHandler*>(m_codecHandler.get()))
   {
-    m_pts = pts;
     return true;
   }
   else
@@ -233,11 +229,3 @@ bool CSubtitleSampleReader::TimeSeek(uint64_t pts, bool preceeding)
     return false;
   }
 }
-
-void CSubtitleSampleReader::SetPTSDiff(uint64_t pts)
-{
-  // Its needed set the PTS diff from the timing stream
-  // to allow sync segmented subtitles for cases like
-  // HLS with multiple periods
-  m_ptsDiff = pts;
-}

src/samplereader/SubtitleSampleReader.h

@@ -41,8 +41,7 @@ class ATTR_DLL_LOCAL CSubtitleSampleReader : public ISampleReader
   bool GetInformation(kodi::addon::InputstreamInfo& info) override;
   bool TimeSeek(uint64_t pts, bool preceeding) override;
   void SetPTSOffset(uint64_t offset) override { }
-  int64_t GetPTSDiff() const override { return m_ptsDiff; }
-  void SetPTSDiff(uint64_t pts) override;
+  int64_t GetPTSDiff() const override { return 0; }
   uint32_t GetTimeScale() const override { return 1000; }
   AP4_Size GetSampleDataSize() const override { return m_sampleData.GetDataSize(); }
   const AP4_Byte* GetSampleData() const override { return m_sampleData.GetData(); }
@@ -53,7 +52,6 @@ class ATTR_DLL_LOCAL CSubtitleSampleReader : public ISampleReader
   bool InitializeFile(std::string url);
 
   uint64_t m_pts{0};
-  int64_t m_ptsDiff{0};
   bool m_eos{false};
   bool m_started{false};
   std::unique_ptr<CodecHandler> m_codecHandler;