Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 1 file). Show all
Unified · Split
| @@ -571,8 +571,8 @@ void CWelsH264SVCEncoder::UpdateStatistics (const int64_t kiCurrentFrameTs, EVid · 570 unmodified lines | |||
| 571 | } else { | 571 | } else { |
| 572 | m_pEncContext->uiStartTimestamp = kiCurrentFrameTs; | 572 | m_pEncContext->uiStartTimestamp = kiCurrentFrameTs; |
| 573 | } | 573 | } |
| 574 | pStatistics->fLatestFrameRate = m_pEncContext->pWelsSvcRc->fLatestFrameRate; //TODO: finish the calculation in RC | 574 | //pStatistics->fLatestFrameRate = m_pEncContext->pWelsSvcRc->fLatestFrameRate; //TODO: finish the calculation in RC |
| 575 | pStatistics->uiBitRate = m_pEncContext->pWelsSvcRc->iActualBitRate; //TODO: finish the calculation in RC | 575 | //pStatistics->uiBitRate = m_pEncContext->pWelsSvcRc->iActualBitRate; //TODO: finish the calculation in RC |
| 576 | pStatistics->uiAverageFrameQP = m_pEncContext->pWelsSvcRc->iAverageFrameQp; | 576 | pStatistics->uiAverageFrameQP = m_pEncContext->pWelsSvcRc->iAverageFrameQp; |
| 577 | 577 | ||
| 578 | if (videoFrameTypeIDR == eFrameType || videoFrameTypeI == eFrameType) { | 578 | if (videoFrameTypeIDR == eFrameType || videoFrameTypeI == eFrameType) { |
| @@ -610,13 +610,14 @@ void CWelsH264SVCEncoder::UpdateStatistics (const int64_t kiCurrentFrameTs, EVid · 31 unmodified lines | |||
| 610 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, | 610 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, |
| 611 | "EncoderStatistics: %dx%d, SpeedInMs: %f, fAverageFrameRate=%f, \ | 611 | "EncoderStatistics: %dx%d, SpeedInMs: %f, fAverageFrameRate=%f, \ |
| 612 | LastFrameRate=%f, LatestBitRate=%d, LastFrameQP=%d, uiInputFrameCount=%d, uiSkippedFrameCount=%d, \ | 612 | LastFrameRate=%f, LatestBitRate=%d, LastFrameQP=%d, uiInputFrameCount=%d, uiSkippedFrameCount=%d, \ |
| 613 | uiResolutionChangeTimes=%d, uIDRReqNum=%d, uIDRSentNum=%d, uLTRSentNum=NA, iTotalEncodedBytes=%"PRId64, | 613 | uiResolutionChangeTimes=%d, uIDRReqNum=%d, uIDRSentNum=%d, uLTRSentNum=NA, iTotalEncodedBytes=%"PRId64"\ |
| 614 | at Ts = %"PRId64, | ||
| 614 | pStatistics->uiWidth, pStatistics->uiHeight, | 615 | pStatistics->uiWidth, pStatistics->uiHeight, |
| 615 | pStatistics->fAverageFrameSpeedInMs, pStatistics->fAverageFrameRate, | 616 | pStatistics->fAverageFrameSpeedInMs, pStatistics->fAverageFrameRate, |
| 616 | pStatistics->fLatestFrameRate, pStatistics->uiBitRate, pStatistics->uiAverageFrameQP, | 617 | pStatistics->fLatestFrameRate, pStatistics->uiBitRate, pStatistics->uiAverageFrameQP, |
| 617 | pStatistics->uiInputFrameCount, pStatistics->uiSkippedFrameCount, | 618 | pStatistics->uiInputFrameCount, pStatistics->uiSkippedFrameCount, |
| 618 | pStatistics->uiResolutionChangeTimes, pStatistics->uiIDRReqNum, pStatistics->uiIDRSentNum, | 619 | pStatistics->uiResolutionChangeTimes, pStatistics->uiIDRReqNum, pStatistics->uiIDRSentNum, |
| 619 | m_pEncContext->iTotalEncodedBytes); | 620 | m_pEncContext->iTotalEncodedBytes, kiCurrentFrameTs); |
| 620 | m_pEncContext->iLastStatisticsLogTs = kiCurrentFrameTs; | 621 | m_pEncContext->iLastStatisticsLogTs = kiCurrentFrameTs; |
| 621 | } | 622 | } |
| 622 | } | 623 | } |