From 75501c54f7c03cd8c0ef6d4155f1a6dadc8ebcf5 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Fri, 29 Jun 2018 11:34:57 +0200
Subject: [PATCH] RTSP live timestamp syncing implemented, syncs with RTMP
 and/or JSON inputs

---
 src/output/output_rtsp.cpp | 22 +++++++++++++++++++++-
 src/output/output_rtsp.h   |  2 ++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/output/output_rtsp.cpp b/src/output/output_rtsp.cpp
index 26f43da2..15af80ab 100644
--- a/src/output/output_rtsp.cpp
+++ b/src/output/output_rtsp.cpp
@@ -18,11 +18,31 @@ namespace Mist{
   void insertPacket(const DTSC::Packet &pkt){classPointer->incomingPacket(pkt);}
 
   /// Takes incoming packets and buffers them.
-  void OutRTSP::incomingPacket(const DTSC::Packet &pkt){bufferLivePacket(pkt);}
+  void OutRTSP::incomingPacket(const DTSC::Packet &pkt){
+    if (!bootMsOffset){
+      if (myMeta.bootMsOffset){
+        bootMsOffset = myMeta.bootMsOffset;
+        packetOffset = (Util::bootMS() - pkt.getTime()) - bootMsOffset;
+      }else{
+        bootMsOffset = Util::bootMS() - pkt.getTime();
+        packetOffset = 0;
+      }
+    }
+    /// \TODO Make this less inefficient. Seriously. Maybe use DTSC::RetimedPacket by extending with bmo functionality...?
+    static DTSC::Packet newPkt;
+    char * pktData;
+    unsigned int pktDataLen;
+    pkt.getString("data", pktData, pktDataLen);
+    newPkt.genericFill(pkt.getTime() + packetOffset, pkt.getInt("offset"), pkt.getTrackId(), pktData, pktDataLen, 0, pkt.getFlag("keyframe"), bootMsOffset);
+    bufferLivePacket(newPkt);
+    //bufferLivePacket(DTSC::RetimedPacket(pkt.getTime() + packetOffset, pkt));
+  }
 
   OutRTSP::OutRTSP(Socket::Connection &myConn) : Output(myConn){
     connectedAt = Util::epoch() + 2208988800ll;
     pausepoint = 0;
+    bootMsOffset = 0;
+    packetOffset = 0;
     setBlocking(false);
     maxSkipAhead = 0;
     expectTCP = false;
diff --git a/src/output/output_rtsp.h b/src/output/output_rtsp.h
index 1f60f826..375126ff 100644
--- a/src/output/output_rtsp.h
+++ b/src/output/output_rtsp.h
@@ -26,6 +26,8 @@ namespace Mist{
     HTTP::Parser HTTP_R, HTTP_S;
     std::string source;
     uint64_t lastTimeSync;
+    int64_t bootMsOffset;
+    int64_t packetOffset;
     bool expectTCP;
     bool checkPort;
     bool handleTCP();