From e712527d420c07568cd73095f95107d0fdf823da Mon Sep 17 00:00:00 2001 From: Thulinma Date: Sat, 1 Jun 2024 14:46:47 +0200 Subject: [PATCH] Fix RTMP outgoing push timestamps --- src/output/output_rtmp.cpp | 10 ---------- src/output/output_rtmp.h | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp index 9310ed20..ccfc8da5 100644 --- a/src/output/output_rtmp.cpp +++ b/src/output/output_rtmp.cpp @@ -30,7 +30,6 @@ namespace Mist{ customAudioIterator = 0; currentFrameTimestamp = 0; lastAck = Util::bootSecs(); - lastOutTime = 0; setRtmpOffset = false; rtmpOffset = 0; authAttempts = 0; @@ -566,15 +565,6 @@ namespace Mist{ if (liveSeek()){return;} } - if (streamOut.size()){ - if (thisPacket.getTime() - rtmpOffset < lastOutTime){ - int64_t OLD = rtmpOffset; - rtmpOffset -= (1 + lastOutTime - (thisPacket.getTime() - rtmpOffset)); - INFO_MSG("Changing rtmpOffset from %" PRId64 " to %" PRId64, OLD, rtmpOffset); - realTime = 800; - } - lastOutTime = thisPacket.getTime() - rtmpOffset; - } uint64_t timestamp = thisPacket.getTime() - rtmpOffset; // make sure we don't go negative if (rtmpOffset > (int64_t)thisPacket.getTime()){ diff --git a/src/output/output_rtmp.h b/src/output/output_rtmp.h index e2b571f0..bcef783d 100644 --- a/src/output/output_rtmp.h +++ b/src/output/output_rtmp.h @@ -24,7 +24,7 @@ namespace Mist{ std::string streamOut; ///< When pushing out, the output stream name bool setRtmpOffset; int64_t rtmpOffset; - uint64_t lastOutTime; + uint64_t lastSend; uint32_t maxbps; std::string app_name; void parseChunk(Socket::Buffer &inputBuffer);