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

RTMP improvements for rollover behaviour

Browse source
This commit is contained in:
Thulinma 2021-03-10 13:08:53 +01:00
parent 73a73abbd7
commit 8cd0bff105
3 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/rtmpchunks.cpp
View file

@ -76,7 +76,7 @@ std::string &RTMPStream::Chunk::Pack(){
output.clear(); output.clear();
bool allow_short = lastsend.count(cs_id); bool allow_short = lastsend.count(cs_id);
RTMPStream::Chunk prev = lastsend[cs_id]; RTMPStream::Chunk prev = lastsend[cs_id];
unsigned int tmpi; uint64_t tmpi;
unsigned char chtype = 0x00; unsigned char chtype = 0x00;
if (allow_short && (prev.cs_id == cs_id)){ if (allow_short && (prev.cs_id == cs_id)){
if (msg_stream_id == prev.msg_stream_id){ if (msg_stream_id == prev.msg_stream_id){
@ -106,7 +106,7 @@ std::string &RTMPStream::Chunk::Pack(){
output += (unsigned char)((cs_id - 64) / 256); output += (unsigned char)((cs_id - 64) / 256);
} }
} }
unsigned int ntime = 0; uint64_t ntime = 0;
if (chtype != 0xC0){ if (chtype != 0xC0){
// timestamp or timestamp diff // timestamp or timestamp diff
if (chtype == 0x00){ if (chtype == 0x00){
@ -458,7 +458,7 @@ bool RTMPStream::Chunk::Parse(Socket::Buffer &buffer){
timestamp += indata[i++] * 256; timestamp += indata[i++] * 256;
timestamp = indata[i++]; timestamp = indata[i++];
ts_delta = timestamp; ts_delta = timestamp;
DONTEVEN_MSG("Extended timestamp: %u", timestamp); DONTEVEN_MSG("Extended timestamp: %" PRIu64, timestamp);
} }
// read data if length > 0, and allocate it // read data if length > 0, and allocate it

6
lib/rtmpchunks.h
View file

@ -51,9 +51,9 @@ namespace RTMPStream{
unsigned char headertype; ///< For input chunks, the type of header. This is calculated unsigned char headertype; ///< For input chunks, the type of header. This is calculated
///< automatically for output chunks. ///< automatically for output chunks.
unsigned int cs_id; ///< ContentStream ID unsigned int cs_id; ///< ContentStream ID
unsigned int timestamp; ///< Timestamp of this chunk. uint64_t timestamp; ///< Timestamp of this chunk.
unsigned int ts_delta; ///< Last timestamp delta. uint32_t ts_delta; ///< Last timestamp delta.
unsigned int ts_header; ///< Last header timestamp without extensions or deltas. uint64_t ts_header; ///< Last header timestamp without extensions or deltas.
unsigned int len; ///< Length of the complete chunk. unsigned int len; ///< Length of the complete chunk.
unsigned int real_len; ///< Length of this particular part of it. unsigned int real_len; ///< Length of this particular part of it.
unsigned int len_left; ///< Length not yet received, out of complete chunk. unsigned int len_left; ///< Length not yet received, out of complete chunk.

23
src/output/output_rtmp.cpp
View file

@ -1427,21 +1427,16 @@ namespace Mist{
} }
tagTime += rtmpOffset; tagTime += rtmpOffset;
uint64_t &ltt = lastTagTime[reTrack]; uint64_t &ltt = lastTagTime[reTrack];
// Check for decreasing timestamps - this is a connection error. if (tagTime < ltt){
// We allow wrapping around the 32 bits maximum value if the most significant 8 bits are set. WARN_MSG("Timestamps went from %" PRIu64 " to %" PRIu64 " (decreased): rewriting timestamps for continuity", ltt, tagTime);
/// \TODO Provide time continuity for wrap-around. rtmpOffset += (ltt-tagTime) + 1;
if (ltt && tagTime < ltt && ltt < 0xFF000000ull){ tagTime += (ltt-tagTime) + 1;
FAIL_MSG("Timestamps went from %" PRIu64 " to %" PRIu64 " (decreased): disconnecting!", ltt, tagTime); }else{
onFinish(); if (tagTime > ltt + 600000){
break; WARN_MSG("Timestamps went from %" PRIu64 " to %" PRIu64 " (increased): rewriting timestamps for continuity", ltt, tagTime);
rtmpOffset -= (tagTime - ltt) - 1;
tagTime -= (tagTime - ltt) - 1;
} }
// Check if we went more than 10 minutes into the future
if (ltt && tagTime > ltt + 600000){
FAIL_MSG("Timestamps went from %" PRIu64 " to %" PRIu64
" (> 10m in future): disconnecting!",
ltt, tagTime);
onFinish();
break;
} }
uint64_t idx = reTrackToID[reTrack]; uint64_t idx = reTrackToID[reTrack];
if (idx != INVALID_TRACK_ID && !userSelect.count(idx)){ if (idx != INVALID_TRACK_ID && !userSelect.count(idx)){