Unified · Split
| @@ -1315,7 +1315,7 @@ void WelsRcPictureInitGomTimeStamp (sWelsEncCtx* pEncCtx, long long uiTimeStamp · 1314 unmodified lines | |||
| 1315 | pWelsSvcRc->iCost2BitsIntra), pWelsSvcRc->iTargetBits); | 1315 | pWelsSvcRc->iCost2BitsIntra), pWelsSvcRc->iTargetBits); |
| 1316 | iLumaQp = RcConvertQStep2Qp (pWelsSvcRc->iQStep); | 1316 | iLumaQp = RcConvertQStep2Qp (pWelsSvcRc->iQStep); |
| 1317 | 1317 | ||
| 1318 | iLumaQp = WELS_CLIP3 (iLumaQp, pEncCtx->iGlobalQp - DELTA_QP_BGD_THD, pEncCtx->iGlobalQp + DELTA_QP_BGD_THD); | 1318 | iLumaQp = WELS_CLIP3 (iLumaQp, pWelsSvcRc->iLastCalculatedQScale - DELTA_QP_BGD_THD, pWelsSvcRc->iLastCalculatedQScale + DELTA_QP_BGD_THD); |
| 1319 | 1319 | ||
| 1320 | } else { | 1320 | } else { |
| 1321 | iLumaQp = pWelsSvcRc->iLastCalculatedQScale + DELTA_QP_BGD_THD; | 1321 | iLumaQp = pWelsSvcRc->iLastCalculatedQScale + DELTA_QP_BGD_THD; |
| @@ -1352,7 +1352,7 @@ void WelsRcPictureInitGomTimeStamp (sWelsEncCtx* pEncCtx, long long uiTimeStamp · 30 unmodified lines | |||
| 1352 | 1352 | ||
| 1353 | pWelsSvcRc->iQStep = WELS_DIV_ROUND ((pTOverRc->iLinearCmplx * iCmplxRatio), (pWelsSvcRc->iTargetBits * INT_MULTIPLY)); | 1353 | pWelsSvcRc->iQStep = WELS_DIV_ROUND ((pTOverRc->iLinearCmplx * iCmplxRatio), (pWelsSvcRc->iTargetBits * INT_MULTIPLY)); |
| 1354 | iLumaQp = RcConvertQStep2Qp (pWelsSvcRc->iQStep); | 1354 | iLumaQp = RcConvertQStep2Qp (pWelsSvcRc->iQStep); |
| 1355 | iLumaQp = WELS_CLIP3 (iLumaQp, pEncCtx->iGlobalQp - DELTA_QP_BGD_THD, pEncCtx->iGlobalQp + DELTA_QP_BGD_THD); | 1355 | iLumaQp = WELS_CLIP3 (iLumaQp, pWelsSvcRc->iLastCalculatedQScale - DELTA_QP_BGD_THD, pWelsSvcRc->iLastCalculatedQScale + DELTA_QP_BGD_THD); |
| 1356 | } | 1356 | } |
| 1357 | } else { | 1357 | } else { |
| 1358 | iLumaQp = pWelsSvcRc->iLastCalculatedQScale + DELTA_QP_BGD_THD; | 1358 | iLumaQp = pWelsSvcRc->iLastCalculatedQScale + DELTA_QP_BGD_THD; |
| @@ -1375,8 +1375,8 @@ void WelsRcPictureInitGomTimeStamp (sWelsEncCtx* pEncCtx, long long uiTimeStamp · 16 unmodified lines | |||
| 1375 | float fInstantFps = (uiTimeStamp - pWelsSvcRc->uiLastTimeStamp) > 0 ? (1000.0f / (uiTimeStamp - | 1375 | float fInstantFps = (uiTimeStamp - pWelsSvcRc->uiLastTimeStamp) > 0 ? (1000.0f / (uiTimeStamp - |
| 1376 | pWelsSvcRc->uiLastTimeStamp)) : 0; | 1376 | pWelsSvcRc->uiLastTimeStamp)) : 0; |
| 1377 | WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG, | 1377 | WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG, |
| 1378 | "[Rc]pEncCtx->iGlobalQp= %d,uiTimeStamp = %lld,uiLastTimeStamp = %lld,InstantFps = %f,settingFps = %f", | 1378 | "[Rc]Tid = %d,Did = %d,pEncCtx->iGlobalQp= %d,iLumaQp = %d,uiTimeStamp = %lld,uiLastTimeStamp = %lld,InstantFps = %f,settingFps = %f",pEncCtx->uiTemporalId,pEncCtx->uiDependencyId, |
| 1379 | pEncCtx->iGlobalQp, uiTimeStamp, pWelsSvcRc->uiLastTimeStamp, | 1379 | pEncCtx->iGlobalQp, iLumaQp,uiTimeStamp, pWelsSvcRc->uiLastTimeStamp, |
| 1380 | fInstantFps, pDLayerParam->fFrameRate); | 1380 | fInstantFps, pDLayerParam->fFrameRate); |
| 1381 | pWelsSvcRc->uiLastTimeStamp = uiTimeStamp; | 1381 | pWelsSvcRc->uiLastTimeStamp = uiTimeStamp; |
| 1382 | 1382 | ||