matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stream rate calculation when avg rate changes from 0 to > 0

Browse Source 
Fixes #294
This commit is contained in:
Srivats P 2020-01-30 17:49:03 +05:30
parent 176fc7dd15
commit 018a8490cf
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/port.cpp
View File

@ -187,6 +187,11 @@ void Port::setAveragePacketRate(double packetsPerSec)
Q_ASSERT(false); // Unreachable!! Q_ASSERT(false); // Unreachable!!
} }
// if old avgPps is 0, new rate will be calculated as nan (infinity)
// because of divide by 0 (old avgPps) above - fix that
if (std::isnan(rate))
rate = packetsPerSec;
qDebug("cur stream pps = %g", s->averagePacketRate()); qDebug("cur stream pps = %g", s->averagePacketRate());
s->setAveragePacketRate(rate); s->setAveragePacketRate(rate);
@ -261,6 +266,11 @@ void Port::setAverageBitRate(double bitsPerSec)
Q_ASSERT(false); // Unreachable!! Q_ASSERT(false); // Unreachable!!
} }
// if old avgBps is 0, new rate will be calculated as nan (infinity)
// because of divide by 0 (old avgBps) above - fix that
if (std::isnan(rate))
rate = bitsPerSec/((s->frameLenAvg()+kEthOverhead)*8);
qDebug("cur stream pps = %g", s->averagePacketRate()); qDebug("cur stream pps = %g", s->averagePacketRate());
s->setAveragePacketRate(rate); s->setAveragePacketRate(rate);