generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid QP sudden fluctates

Browse Source
This commit is contained in:
lyao2 2014-03-20 13:13:32 +08:00
parent 4bc881c3ae
commit 071254748f
3 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
codec/encoder/core/inc/rc.h
View File

@ -56,9 +56,9 @@ namespace WelsSVCEnc {
#define WELS_RC_GOM 1 #define WELS_RC_GOM 1
typedef enum { typedef enum {
RC_MODE0, //Quality mode RC_QUALITY_MODE, //Quality mode
RC_MODE1, //Bitrate mode RC_BITRATE_MODE, //Bitrate mode
RC_MODE_LOWBR, //bitrate limited mode RC_LOW_BW_MODE, //bitrate limited mode
} RC_MODES; } RC_MODES;
enum{ enum{
@ -74,6 +74,7 @@ enum {
//qp information //qp information
GOM_MIN_QP_MODE = 12, GOM_MIN_QP_MODE = 12,
GOM_MAX_QP_MODE = 36, GOM_MAX_QP_MODE = 36,
MAX_LOW_BR_QP = 42,
MIN_IDR_QP = 26, MIN_IDR_QP = 26,
MAX_IDR_QP = 32, MAX_IDR_QP = 32,
DELTA_QP = 2, DELTA_QP = 2,

26
codec/encoder/core/src/ratectl.cpp
View File

@ -432,7 +432,23 @@ void RcCalculatePictureQp (sWelsEncCtx* pEncCtx) {
} }
else if (pWelsSvcRc->iCurrentBitsLevel==BITS_EXCEEDED) else if (pWelsSvcRc->iCurrentBitsLevel==BITS_EXCEEDED)
{ {
iLumaQp = 42; iLumaQp = MAX_LOW_BR_QP;
//limit QP
int32_t iLastIdxCodecInVGop = pWelsSvcRc->iFrameCodedInVGop - 1;
if (iLastIdxCodecInVGop < 0)
iLastIdxCodecInVGop += VGOP_SIZE;
int32_t iTlLast = pWelsSvcRc->iTlOfFrames[iLastIdxCodecInVGop];
int32_t iDeltaQpTemporal = iTl - iTlLast;
if (0 == iTlLast && iTl > 0)
iDeltaQpTemporal += 3;
else if (0 == iTl && iTlLast > 0)
iDeltaQpTemporal -= 3;
iLumaQp = WELS_CLIP3 (iLumaQp,
pWelsSvcRc->iLastCalculatedQScale - pWelsSvcRc->iFrameDeltaQpLower + iDeltaQpTemporal,
pWelsSvcRc->iLastCalculatedQScale + pWelsSvcRc->iFrameDeltaQpUpper + iDeltaQpTemporal);
iLumaQp = WELS_CLIP3 (iLumaQp, GOM_MIN_QP_MODE, MAX_LOW_BR_QP);
pWelsSvcRc->dQStep = RcConvertQp2QStep (iLumaQp); pWelsSvcRc->dQStep = RcConvertQp2QStep (iLumaQp);
pWelsSvcRc->iLastCalculatedQScale = iLumaQp; pWelsSvcRc->iLastCalculatedQScale = iLumaQp;
@ -476,7 +492,7 @@ void RcCalculatePictureQp (sWelsEncCtx* pEncCtx) {
iLumaQp = (int32_t)(iLumaQp - pEncCtx->pVaa->sAdaptiveQuantParam.dAverMotionTextureIndexToDeltaQp); iLumaQp = (int32_t)(iLumaQp - pEncCtx->pVaa->sAdaptiveQuantParam.dAverMotionTextureIndexToDeltaQp);
if (pEncCtx->pSvcParam->iRCMode!=RC_MODE_LOWBR) if (pEncCtx->pSvcParam->iRCMode!=RC_LOW_BW_MODE)
iLumaQp = (int32_t)WELS_CLIP3 (iLumaQp,pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp); iLumaQp = (int32_t)WELS_CLIP3 (iLumaQp,pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
} }
@ -515,11 +531,11 @@ void RcDecideTargetBits (sWelsEncCtx* pEncCtx) {
} else { } else {
pWelsSvcRc->iTargetBits = (int32_t) (pWelsSvcRc->iRemainingBits * pTOverRc->dTlayerWeight / pWelsSvcRc->iTargetBits = (int32_t) (pWelsSvcRc->iRemainingBits * pTOverRc->dTlayerWeight /
pWelsSvcRc->dRemainingWeights); pWelsSvcRc->dRemainingWeights);
if ((pWelsSvcRc->iTargetBits <= 0) && (pEncCtx->pSvcParam->iRCMode == RC_MODE_LOWBR)) if ((pWelsSvcRc->iTargetBits <= 0) && (pEncCtx->pSvcParam->iRCMode == RC_LOW_BW_MODE))
{ {
pWelsSvcRc->iCurrentBitsLevel = BITS_EXCEEDED; pWelsSvcRc->iCurrentBitsLevel = BITS_EXCEEDED;
} }
else if ((pWelsSvcRc->iTargetBits <= pTOverRc->iMinBitsTl) && (pEncCtx->pSvcParam->iRCMode == RC_MODE_LOWBR)) else if ((pWelsSvcRc->iTargetBits <= pTOverRc->iMinBitsTl) && (pEncCtx->pSvcParam->iRCMode == RC_LOW_BW_MODE))
{ {
pWelsSvcRc->iCurrentBitsLevel = BITS_LIMITED; pWelsSvcRc->iCurrentBitsLevel = BITS_LIMITED;
} }
@ -645,7 +661,7 @@ void RcCalculateGomQp (sWelsEncCtx* pEncCtx, SMB* pCurMb, int32_t iSliceId) {
pSOverRc->iCalculatedQpSlice = WELS_CLIP3 (pSOverRc->iCalculatedQpSlice, pSOverRc->iCalculatedQpSlice = WELS_CLIP3 (pSOverRc->iCalculatedQpSlice,
pEncCtx->iGlobalQp - pWelsSvcRc->iQpRangeLowerInFrame, pEncCtx->iGlobalQp + pWelsSvcRc->iQpRangeUpperInFrame); pEncCtx->iGlobalQp - pWelsSvcRc->iQpRangeLowerInFrame, pEncCtx->iGlobalQp + pWelsSvcRc->iQpRangeUpperInFrame);
if (!(pEncCtx->pSvcParam->iRCMode==RC_MODE_LOWBR)) if (!(pEncCtx->pSvcParam->iRCMode==RC_LOW_BW_MODE))
pSOverRc->iCalculatedQpSlice = WELS_CLIP3 (pSOverRc->iCalculatedQpSlice, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp); pSOverRc->iCalculatedQpSlice = WELS_CLIP3 (pSOverRc->iCalculatedQpSlice, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
pSOverRc->iGomBitsSlice = 0; pSOverRc->iGomBitsSlice = 0;

8
codec/encoder/core/src/wels_preprocess.cpp
View File

@ -346,7 +346,7 @@ int32_t CWelsPreProcess::AnalyzeSpatialPic (sWelsEncCtx* pCtx, const int32_t kiD
{ {
SPicture* pLastPic = m_pLastSpatialPicture[kiDidx][0]; SPicture* pLastPic = m_pLastSpatialPicture[kiDidx][0];
bool bCalculateSQDiff = ((pLastPic->pData[0] == pRefPic->pData[0]) && bNeededMbAq); bool bCalculateSQDiff = ((pLastPic->pData[0] == pRefPic->pData[0]) && bNeededMbAq);
bool bCalculateVar = (pSvcParam->iRCMode >= RC_MODE1 && pCtx->eSliceType == I_SLICE); bool bCalculateVar = (pSvcParam->iRCMode >= RC_BITRATE_MODE && pCtx->eSliceType == I_SLICE);
VaaCalculation (pCtx->pVaa, pCurPic, pRefPic, bCalculateSQDiff, bCalculateVar, bCalculateBGD); VaaCalculation (pCtx->pVaa, pCurPic, pRefPic, bCalculateSQDiff, bCalculateVar, bCalculateBGD);
} }
@ -831,11 +831,11 @@ void CWelsPreProcess::AnalyzePictureComplexity (sWelsEncCtx* pCtx, SPicture* pCu
SWelsSvcRc* SWelsSvcRc = &pCtx->pWelsSvcRc[kiDependencyId]; SWelsSvcRc* SWelsSvcRc = &pCtx->pWelsSvcRc[kiDependencyId];
int32_t iComplexityAnalysisMode = 0; int32_t iComplexityAnalysisMode = 0;
if (pSvcParam->iRCMode == RC_MODE0 && pCtx->eSliceType == P_SLICE) { if (pSvcParam->iRCMode == RC_QUALITY_MODE && pCtx->eSliceType == P_SLICE) {
iComplexityAnalysisMode = FRAME_SAD; iComplexityAnalysisMode = FRAME_SAD;
} else if (pSvcParam->iRCMode >= RC_MODE1 && pCtx->eSliceType == P_SLICE) { } else if (pSvcParam->iRCMode >= RC_BITRATE_MODE && pCtx->eSliceType == P_SLICE) {
iComplexityAnalysisMode = GOM_SAD; iComplexityAnalysisMode = GOM_SAD;
} else if (pSvcParam->iRCMode >= RC_MODE1 && pCtx->eSliceType == I_SLICE) { } else if (pSvcParam->iRCMode >= RC_BITRATE_MODE && pCtx->eSliceType == I_SLICE) {
iComplexityAnalysisMode = GOM_VAR; iComplexityAnalysisMode = GOM_VAR;
} else { } else {
return; return;