hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implemented per-track timestamp offsets & 24/32-bit rollover rounding

Browse source
This commit is contained in:
Thulinma 2023-03-16 00:27:55 +01:00
parent cc9aae7926
commit 131d4c3bb5
1 changed files with 48 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/output/output_rtmp.cpp
View file

@ -11,6 +11,14 @@
#include <mist/util.h> #include <mist/util.h>
#include <sys/stat.h> #include <sys/stat.h>
const char * trackType(char ID){
if (ID == 8){return "audio";}
if (ID == 9){return "video";}
if (ID == 18){return "metadata";}
return "unknown";
}
namespace Mist{ namespace Mist{
OutRTMP::OutRTMP(Socket::Connection &conn) : Output(conn){ OutRTMP::OutRTMP(Socket::Connection &conn) : Output(conn){
lastSilence = 0; lastSilence = 0;
@ -1680,6 +1688,7 @@ namespace Mist{
case 18:{// meta data case 18:{// meta data
static std::map<size_t, AMF::Object> pushMeta; static std::map<size_t, AMF::Object> pushMeta;
static std::map<size_t, uint64_t> lastTagTime; static std::map<size_t, uint64_t> lastTagTime;
static std::map<size_t, int64_t> trackOffset;
static std::map<size_t, size_t> reTrackToID; static std::map<size_t, size_t> reTrackToID;
if (!isInitialized || !meta){ if (!isInitialized || !meta){
MEDIUM_MSG("Received useless media data"); MEDIUM_MSG("Received useless media data");
@ -1712,18 +1721,48 @@ namespace Mist{
rtmpOffset = (Util::bootMS() - tagTime) - M.getBootMsOffset() + timeOffset; rtmpOffset = (Util::bootMS() - tagTime) - M.getBootMsOffset() + timeOffset;
setRtmpOffset = true; setRtmpOffset = true;
} }
tagTime += rtmpOffset; tagTime += rtmpOffset + trackOffset[reTrack];
uint64_t &ltt = lastTagTime[reTrack]; uint64_t &ltt = lastTagTime[reTrack];
if (tagTime < ltt){ if (tagTime < ltt){
WARN_MSG("Timestamps went from %" PRIu64 " to %" PRIu64 " (decreased): rewriting timestamps for continuity", ltt, tagTime); uint64_t diff = ltt - tagTime;
rtmpOffset += (ltt-tagTime) + 1; // Round to 24-bit rollover if within 0xfff of it on either side.
tagTime += (ltt-tagTime) + 1; // Round to 32-bit rollover if within 0xfff of it on either side.
}else{ // Make sure time increases by 1ms if neither applies.
if (tagTime > ltt + 600000){ if (diff > 0xfff000ull && diff < 0x1000fffull){
WARN_MSG("Timestamps went from %" PRIu64 " to %" PRIu64 " (increased): rewriting timestamps for continuity", ltt, tagTime); diff = 0x1000000ull;
rtmpOffset -= (tagTime - ltt) - 1; WARN_MSG("Timestamp for %s went from %" PRIu64 " to %" PRIu64 " (decreased by 24-bit rollover): compensating", trackType(next.msg_type_id), ltt, tagTime);
tagTime -= (tagTime - ltt) - 1; }else if (diff > 0xfffff000ull && diff < 0x100000fffull){
diff = 0x100000000ull;
WARN_MSG("Timestamp for %s went from %" PRIu64 " to %" PRIu64 " (decreased by 32-bit rollover): compensating", trackType(next.msg_type_id), ltt, tagTime);
}else{
diff += 1;
WARN_MSG("Timestamp for %s went from %" PRIu64 " to %" PRIu64 " (decreased by %" PRIu64 "): compensating", trackType(next.msg_type_id), ltt, tagTime, diff);
} }
trackOffset[reTrack] += diff;
tagTime += diff;
}else if (tagTime > ltt + 600000){
uint64_t diff = tagTime - ltt;
// Round to 24-bit rollover if within 0xfff of it on either side.
// Round to 32-bit rollover if within 0xfff of it on either side.
// Make sure time increases by 1ms if neither applies.
if (diff > 0xfff000ull && diff < 0x1000fffull){
diff = 0x1000000ull;
WARN_MSG("Timestamp for %s went from %" PRIu64 " to %" PRIu64 " (increased by 24-bit rollover): compensating", trackType(next.msg_type_id), ltt, tagTime);
}else if (diff > 0xfffff000ull && diff < 0x100000fffull){
diff = 0x100000000ull;
WARN_MSG("Timestamp for %s went from %" PRIu64 " to %" PRIu64 " (increased by 32-bit rollover): compensating", trackType(next.msg_type_id), ltt, tagTime);
}else{
diff -= 1;
if (ltt){
WARN_MSG("Timestamp for %s went from %" PRIu64 " to %" PRIu64 " (increased by %" PRIu64 "): compensating", trackType(next.msg_type_id), ltt, tagTime, diff);
}
}
if (ltt){
trackOffset[reTrack] -= diff;
}else{
rtmpOffset -= diff;
}
tagTime -= diff;
} }
size_t idx = reTrackToID[reTrack]; size_t idx = reTrackToID[reTrack];
if (idx != INVALID_TRACK_ID && !userSelect.count(idx)){ if (idx != INVALID_TRACK_ID && !userSelect.count(idx)){