Merge pull request #1548 from sijchen/after_review

[Encoder] add one more condition for statistics printing to avoid potential timestamp problem
This commit is contained in:
ruil2 2014-11-25 11:20:38 +08:00
commit f1fb0d6b69

View File

@ -640,11 +640,13 @@ void CWelsH264SVCEncoder::UpdateStatistics (const int64_t kiCurrentFrameTs, EVid
if (m_pEncContext->iStatisticsLogInterval > 0) {
int64_t iTimeDiff = kiCurrentFrameTs - m_pEncContext->iLastStatisticsLogTs;
if (iTimeDiff > m_pEncContext->iStatisticsLogInterval) {
if (iTimeDiff > m_pEncContext->iStatisticsLogInterval || 0 == pStatistics->uiInputFrameCount % 300) {
if (iTimeDiff) {
pStatistics->fLatestFrameRate = (pStatistics->uiInputFrameCount - m_pEncContext->iLastStatisticsFrameCount) * 1000 /
iTimeDiff;
pStatistics->uiBitRate = static_cast<unsigned int> ((m_pEncContext->iTotalEncodedBits -
m_pEncContext->iLastStatisticsBits) * 1000 / iTimeDiff);
}
// update variables
m_pEncContext->iLastStatisticsLogTs = kiCurrentFrameTs;