public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- revert to previous jitter calculation algorithm

This commit is contained in:
Dmytro Bogovych 2019-03-04 21:02:32 +02:00
parent c7fa3dd011
commit 2b0b74f084
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/engine/media/MT_Statistics.cpp
View File

@ -9,6 +9,7 @@ using namespace MT;
void JitterStatistics::process(jrtplib::RTPPacket* packet, int rate) void JitterStatistics::process(jrtplib::RTPPacket* packet, int rate)
{ {
/*
uint32_t arrival = 0; uint32_t arrival = 0;
int d = 0; int d = 0;
uint32_t transit = 0; uint32_t transit = 0;
@ -23,25 +24,25 @@ void JitterStatistics::process(jrtplib::RTPPacket* packet, int rate)
if (mPrevArrival == 0) if (mPrevArrival == 0)
arrival = packet->GetTimestamp(); arrival = packet->GetTimestamp();
else else
arrival += mPrevArrival;; arrival += mPrevArrival;
mPrevArrival = packet->GetTimestamp(); mPrevArrival = packet->GetTimestamp();
transit = arrival - packet->GetTimestamp(); transit = arrival - packet->GetTimestamp();
jrtplib::RTPTime receiveTime = packet->GetReceiveTime();
d = transit - mPrevTransit; d = transit - mPrevTransit;
mPrevTransit = transit; mPrevTransit = transit;
if (d < 0) if (d < 0)
d = -d; d = -d;
mJitter += (1.0/16.0) * ((double)d - mJitter); mJitterNow += (1.0/16.0) * ((double)d - mJitterNow);
mPrevRxTimestamp = current_time; mPrevRxTimestamp = current_time;
if (mMaxJitter < mJitter) if (mMaxJitter < mJitterNow)
mMaxJitter = mJitter; mMaxJitter = mJitterNow;
*/
uint32_t timestamp = packet->GetTimestamp(); uint32_t timestamp = packet->GetTimestamp();
jrtplib::RTPTime receiveTime = packet->GetReceiveTime();
if (!mLastJitter.is_initialized()) if (!mLastJitter.is_initialized())
{ {
@ -68,6 +69,8 @@ void JitterStatistics::process(jrtplib::RTPPacket* packet, int rate)
mJitter.process(mLastJitter.value()); mJitter.process(mLastJitter.value());
} }
//mJitter.process(mJitterNow / rate);
} }

1
src/engine/media/MT_Statistics.h
View File

@ -92,6 +92,7 @@ protected:
uint64_t mPrevRxTimestamp = 0; uint64_t mPrevRxTimestamp = 0;
uint64_t mPrevArrival = 0; uint64_t mPrevArrival = 0;
uint64_t mPrevTransit = 0; uint64_t mPrevTransit = 0;
double mJitterNow = 0.0, mMaxJitter = 0.0;
}; };
class Statistics class Statistics