Add a 20s timeout for handling network errors

clsid2 · Apr 9, 2021 · ccaaa70 · ccaaa70
1 parent feb07eb
commit ccaaa70
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/demuxer/Demuxers/LAVFDemuxer.cpp b/demuxer/Demuxers/LAVFDemuxer.cpp
@@ -189,6 +189,11 @@ int CLAVFDemuxer::avio_interrupt_cb(void *opaque)
     if (demux->m_timeOpening && now > (demux->m_timeOpening + AVFORMAT_OPEN_TIMEOUT))
         return 1;
 
+    if (demux->m_timePacketRead && now > (demux->m_timePacketRead + AVFORMAT_OPEN_TIMEOUT)) {
+        DbgLog((LOG_ERROR, 0, TEXT("Timeout while reading packet")));
+        return 1;
+    }
+
     if (demux->m_Abort && now > demux->m_timeAbort)
         return 1;
 
@@ -1451,6 +1456,7 @@ STDMETHODIMP CLAVFDemuxer::GetNextPacket(Packet **ppPacket)
         m_avFormat->pb->eof_reached = 0;
     }
 
+    m_timePacketRead = time(nullptr);
     int result = 0;
     try
     {
@@ -1460,10 +1466,12 @@ STDMETHODIMP CLAVFDemuxer::GetNextPacket(Packet **ppPacket)
     {
         // ignore..
     }
+    m_timePacketRead = 0;
 
     if (result == AVERROR(EINTR) || result == AVERROR(EAGAIN))
     {
         // timeout, probably no real error, return empty packet
+        DbgLog((LOG_TRACE, 10, L"::GetNextPacket(): Timeout"));
         bReturnEmpty = true;
     }
     else if (result == AVERROR_EOF)
@@ -1472,6 +1480,7 @@ STDMETHODIMP CLAVFDemuxer::GetNextPacket(Packet **ppPacket)
     }
     else if (result < 0)
     {
+        DbgLog((LOG_TRACE, 10, L"::GetNextPacket(): Fail, result = %d"), result);
         // meh, fail
     }
     else if (pkt.size <= 0 || pkt.stream_index < 0 || (unsigned)pkt.stream_index >= m_avFormat->nb_streams)

diff --git a/demuxer/Demuxers/LAVFDemuxer.h b/demuxer/Demuxers/LAVFDemuxer.h
@@ -237,4 +237,6 @@ class CLAVFDemuxer
     int m_Abort = 0;
     time_t m_timeAbort = 0;
     time_t m_timeOpening = 0;
+    time_t m_timePacketRead = 0;
+
 };