This avoids including excessive spacing from the indentation in the actual message.
Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 2 files). Show all
Unified · Split
| @@ -486,9 +486,9 @@ int CWelsH264SVCEncoder::ForceIntraFrame (bool bIDR) { · 485 unmodified lines | |||
| 486 | } | 486 | } |
| 487 | void CWelsH264SVCEncoder::TraceParamInfo (SEncParamExt* pParam) { | 487 | void CWelsH264SVCEncoder::TraceParamInfo (SEncParamExt* pParam) { |
| 488 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, | 488 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, |
| 489 | "iUsageType = %d,iPicWidth= %d;iPicHeight= %d;iTargetBitrate= %d;iMaxBitrate= %d;iRCMode= %d;iPaddingFlag= %d;iTemporalLayerNum= %d;iSpatialLayerNum= %d;fFrameRate= %.6ff;uiIntraPeriod= %d;\ | 489 | "iUsageType = %d,iPicWidth= %d;iPicHeight= %d;iTargetBitrate= %d;iMaxBitrate= %d;iRCMode= %d;iPaddingFlag= %d;iTemporalLayerNum= %d;iSpatialLayerNum= %d;fFrameRate= %.6ff;uiIntraPeriod= %d;" |
| 490 | eSpsPpsIdStrategy = %d;bPrefixNalAddingCtrl = %d;bEnableDenoise= %d;bEnableBackgroundDetection= %d;bEnableAdaptiveQuant= %d;bEnableFrameSkip= %d;bEnableLongTermReference= %d;iLtrMarkPeriod= %d;\ | 490 | "eSpsPpsIdStrategy = %d;bPrefixNalAddingCtrl = %d;bEnableDenoise= %d;bEnableBackgroundDetection= %d;bEnableAdaptiveQuant= %d;bEnableFrameSkip= %d;bEnableLongTermReference= %d;iLtrMarkPeriod= %d;" |
| 491 | iComplexityMode = %d;iNumRefFrame = %d;iEntropyCodingModeFlag = %d;uiMaxNalSize = %d;iLTRRefNum = %d;iMultipleThreadIdc = %d;iLoopFilterDisableIdc = %d (offset(alpha/beta): %d,%d)", | 491 | "iComplexityMode = %d;iNumRefFrame = %d;iEntropyCodingModeFlag = %d;uiMaxNalSize = %d;iLTRRefNum = %d;iMultipleThreadIdc = %d;iLoopFilterDisableIdc = %d (offset(alpha/beta): %d,%d)", |
| 492 | pParam->iUsageType, | 492 | pParam->iUsageType, |
| 493 | pParam->iPicWidth, | 493 | pParam->iPicWidth, |
| 494 | pParam->iPicHeight, | 494 | pParam->iPicHeight, |
| @@ -524,8 +524,8 @@ void CWelsH264SVCEncoder::TraceParamInfo (SEncParamExt* pParam) { · 29 unmodified lines | |||
| 524 | while (i < iSpatialLayers) { | 524 | while (i < iSpatialLayers) { |
| 525 | SSpatialLayerConfig* pSpatialCfg = &pParam->sSpatialLayers[i]; | 525 | SSpatialLayerConfig* pSpatialCfg = &pParam->sSpatialLayers[i]; |
| 526 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, | 526 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, |
| 527 | "sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iMaxSpatialBitrate= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.iSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\ | 527 | "sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iMaxSpatialBitrate= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.iSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;" |
| 528 | uiProfileIdc = %d;uiLevelIdc = %d", | 528 | "uiProfileIdc = %d;uiLevelIdc = %d", |
| 529 | i, pSpatialCfg->iVideoWidth, | 529 | i, pSpatialCfg->iVideoWidth, |
| 530 | pSpatialCfg->iVideoHeight, | 530 | pSpatialCfg->iVideoHeight, |
| 531 | pSpatialCfg->fFrameRate, | 531 | pSpatialCfg->fFrameRate, |
| @@ -608,10 +608,10 @@ void CWelsH264SVCEncoder::UpdateStatistics (const int64_t kiCurrentFrameTs, EVid · 76 unmodified lines | |||
| 608 | const int64_t kiTimeDiff = kiCurrentFrameTs - m_pEncContext->iLastStatisticsLogTs; | 608 | const int64_t kiTimeDiff = kiCurrentFrameTs - m_pEncContext->iLastStatisticsLogTs; |
| 609 | if ((kiTimeDiff > m_pEncContext->iStatisticsLogInterval) || (0 == pStatistics->uiInputFrameCount % 300)) { | 609 | if ((kiTimeDiff > m_pEncContext->iStatisticsLogInterval) || (0 == pStatistics->uiInputFrameCount % 300)) { |
| 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 | "at Ts = %"PRId64, |
| 615 | pStatistics->uiWidth, pStatistics->uiHeight, | 615 | pStatistics->uiWidth, pStatistics->uiHeight, |
| 616 | pStatistics->fAverageFrameSpeedInMs, pStatistics->fAverageFrameRate, | 616 | pStatistics->fAverageFrameSpeedInMs, pStatistics->fAverageFrameRate, |
| 617 | pStatistics->fLatestFrameRate, pStatistics->uiBitRate, pStatistics->uiAverageFrameQP, | 617 | pStatistics->fLatestFrameRate, pStatistics->uiBitRate, pStatistics->uiAverageFrameQP, |