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

Fixed WebRTC packet counter for receiving broadcasts

Browse source
This commit is contained in:
Thulinma 2021-08-31 19:40:28 +02:00
parent bf2ce9a422
commit c02b9ef265
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/output/output_webrtc.cpp
View file

@ -36,6 +36,7 @@ namespace Mist{
RTXPayloadType = 0;
lastTransit = 0;
jitter = 0;
lastPktCount = 0;
}
void WebRTCTrack::gotPacket(uint32_t ts){
@ -1301,7 +1302,26 @@ namespace Mist{
uint64_t ntpTime = Bit::btohll(udp.data + 8);
uint32_t rtpTime = Bit::btohl(udp.data + 16);
uint32_t packets = Bit::btohl(udp.data + 20);
totalPkts += packets;
if (packets > it->second.lastPktCount){
//counter went up; check if it was less than half the range
if ((packets - it->second.lastPktCount) <= 0x7FFFFFFF){
//It was; great; let's trust it and move on
totalPkts += packets - it->second.lastPktCount;
it->second.lastPktCount = packets;
}
//The else case is a no-op:
//If it went up too much we likely just received an older packet from before last wraparound.
}else{
//counter decreased; could be a wraparound!
//if our new number is in the first 25% and the old number in the last 25%, we assume it was
if (packets <= 0x3FFFFFFF && it->second.lastPktCount >= 0xBFFFFFFF){
//Account for the wraparound, save the new packet counter
totalPkts += (packets - it->second.lastPktCount);
it->second.lastPktCount = packets;
}
//The else case is a no-op:
//If it went down outside those ranges, this is an older packet we should just ignore
}
uint32_t bytes = Bit::btohl(udp.data + 24);
HIGH_MSG("Received sender report for track %s (%" PRIu32 " pkts, %" PRIu32 "b) time: %" PRIu32 " RTP = %" PRIu64 " NTP", it->second.rtpToDTSC.codec.c_str(), packets, bytes, rtpTime, ntpTime);
if (rtpTime && ntpTime){

1
src/output/output_webrtc.h
View file

@ -117,6 +117,7 @@ namespace Mist{
///< with separate SSRC/payload type)
void gotPacket(uint32_t ts);
uint32_t lastTransit;
uint32_t lastPktCount;
double jitter;
};