Remove calls to UpdateCurrentPTS. We haven't read a packet at any of …

…these points, so m_pkt.pkt.dts is invalid. m_currentPts will be updated when a valid packet is read. A new override CurrentPTSUpdated() will be called when this happens so catchup streams can update their internal references

src/stream/FFmpegCatchupStream.cpp

@@ -362,9 +362,9 @@ bool FFmpegCatchupStream::GetTimes(kodi::addon::InputstreamTimes& times)
   return true;
 }
 
-void FFmpegCatchupStream::UpdateCurrentPTS()
+void FFmpegCatchupStream::CurrentPTSUpdated()
 {
-  FFmpegStream::UpdateCurrentPTS();
+  FFmpegStream::CurrentPTSUpdated();
   if (m_currentPts != STREAM_NOPTS_VALUE)
     m_currentPts += m_seekOffset;
 }

src/stream/FFmpegCatchupStream.h

@@ -43,7 +43,7 @@ class FFmpegCatchupStream : public FFmpegStream
   virtual bool IsRealTimeStream() override;
 
 protected:
-  void UpdateCurrentPTS() override;
+  void CurrentPTSUpdated() override;
   bool CheckReturnEmptyOnPacketResult(int result) override;
 
   long long GetCurrentLiveOffset() { return std::time(nullptr) - m_catchupBufferStartTime; }

src/stream/FFmpegStream.cpp

@@ -434,7 +434,10 @@ DEMUX_PACKET* FFmpegStream::DemuxRead()
 
         // used to guess streamlength
         if (pPacket->dts != STREAM_NOPTS_VALUE && (pPacket->dts > m_currentPts || m_currentPts == STREAM_NOPTS_VALUE))
+        {
           m_currentPts = pPacket->dts;
+          CurrentPTSUpdated();
+        }
 
         // store internal id until we know the continuous id presented to player
         // the stream might not have been created yet
@@ -795,8 +798,6 @@ bool FFmpegStream::Open(bool fileinfo)
   // if format can be nonblocking, let's use that
   m_pFormatContext->flags |= AVFMT_FLAG_NONBLOCK;
 
-  UpdateCurrentPTS();
-
   // select the correct program if requested
   m_initialProgramNumber = UINT_MAX;
   CVariant programProp(m_programProperty.empty() ? CVariant::VariantTypeNull : CVariant(m_programProperty));
@@ -1145,20 +1146,8 @@ void FFmpegStream::ResetVideoStreams()
   }
 }
 
-void FFmpegStream::UpdateCurrentPTS()
+void FFmpegStream::CurrentPTSUpdated()
 {
-  m_currentPts = STREAM_NOPTS_VALUE;
-
-  int idx = av_find_default_stream_index(m_pFormatContext);
-  if (idx >= 0)
-  {
-    AVStream* stream = m_pFormatContext->streams[idx];
-    if (stream && m_pkt.pkt.dts != (int64_t)AV_NOPTS_VALUE)
-    {
-      double ts = ConvertTimestamp(m_pkt.pkt.dts, stream->time_base.den, stream->time_base.num);
-      m_currentPts = ts;
-    }
-  }
 }
 
 double FFmpegStream::ConvertTimestamp(int64_t pts, int den, int num)
@@ -1541,7 +1530,7 @@ bool FFmpegStream::SeekTime(double time, bool backwards, double* startpts)
       if (m_pFormatContext->iformat->read_seek)
         m_seekToKeyFrame = true;
 
-      UpdateCurrentPTS();
+        m_currentPts = STREAM_NOPTS_VALUE;
     }
   }
 

src/stream/FFmpegStream.h

@@ -104,7 +104,7 @@ class FFmpegStream
 
 protected:
   virtual std::string GetStreamCodecName(int iStreamId);
-  virtual void UpdateCurrentPTS();
+  virtual void CurrentPTSUpdated();
   bool IsPaused() { return m_speed == STREAM_PLAYSPEED_PAUSE; }
   virtual bool CheckReturnEmptyOnPacketResult(int result);