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

fix the issue that long term reference frame is disable for screen

Browse Source
This commit is contained in:
ruil2 2014-04-29 17:24:22 +08:00
parent 2006efc1e0
commit 2508cf925f
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
codec/encoder/core/inc/param_svc.h
View File

@ -369,8 +369,9 @@ int32_t ParamTranscode (const SEncParamExt& pCodingParam) {
iNumRefFrame = WELS_MAX(1, WELS_LOG2 (uiGopSize)) + iLTRRefNum; iNumRefFrame = WELS_MAX(1, WELS_LOG2 (uiGopSize)) + iLTRRefNum;
} else { } else {
iLTRRefNum = 0; iLTRRefNum = 0;
if( iNumRefFrame == AUTO_REF_PIC_COUNT) if( iNumRefFrame == AUTO_REF_PIC_COUNT)
iNumRefFrame = 1; iNumRefFrame = WELS_MAX(1, uiGopSize>>1);
} }
} else { } else {
iLTRRefNum = bEnableLongTermReference ? WELS_CLIP3(pCodingParam.iLTRRefNum,1,LONG_TERM_REF_NUM) : 0; iLTRRefNum = bEnableLongTermReference ? WELS_CLIP3(pCodingParam.iLTRRefNum,1,LONG_TERM_REF_NUM) : 0;

1
codec/encoder/core/src/encoder.cpp
View File

@ -292,7 +292,6 @@ EVideoFrameType DecideFrameType (sWelsEncCtx* pEncCtx, const int8_t kiSpatialNum
} else { } else {
bSceneChangeFlag = pEncCtx->pVaa->bSceneChangeFlag; bSceneChangeFlag = pEncCtx->pVaa->bSceneChangeFlag;
} }
pEncCtx->bCurFrameMarkedAsSceneLtr = false;
if (pEncCtx->pVaa->bIdrPeriodFlag || pEncCtx->bEncCurFrmAsIdrFlag || (!pSvcParam->bEnableLongTermReference if (pEncCtx->pVaa->bIdrPeriodFlag || pEncCtx->bEncCurFrmAsIdrFlag || (!pSvcParam->bEnableLongTermReference
&& bSceneChangeFlag)) { && bSceneChangeFlag)) {
iFrameType = videoFrameTypeIDR; iFrameType = videoFrameTypeIDR;

1
codec/encoder/core/src/encoder_ext.cpp
View File

@ -2867,6 +2867,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour
#endif//_DEBUG #endif//_DEBUG
pCtx->iEncoderError = ENC_RETURN_SUCCESS; pCtx->iEncoderError = ENC_RETURN_SUCCESS;
pCtx->bCurFrameMarkedAsSceneLtr = false;
pFbi->iLayerNum = 0; // for initialization pFbi->iLayerNum = 0; // for initialization
pFbi->uiTimeStamp = pSrcPic->uiTimeStamp; pFbi->uiTimeStamp = pSrcPic->uiTimeStamp;
// perform csc/denoise/downsample/padding, generate spatial layers // perform csc/denoise/downsample/padding, generate spatial layers

2
codec/encoder/plus/src/welsEncoderExt.cpp
View File

@ -350,7 +350,7 @@ int CWelsH264SVCEncoder::InitializeInternal(SWelsSvcCodingParam* pCfg) {
pCfg->iNumRefFrame = WELS_MAX(1,WELS_LOG2 (pCfg->uiGopSize)) + pCfg->iLTRRefNum; pCfg->iNumRefFrame = WELS_MAX(1,WELS_LOG2 (pCfg->uiGopSize)) + pCfg->iLTRRefNum;
} else { } else {
pCfg->iLTRRefNum = 0; pCfg->iLTRRefNum = 0;
pCfg->iNumRefFrame = 1; pCfg->iNumRefFrame = WELS_MAX(1, pCfg->uiGopSize>>1);
} }
} else { } else {
pCfg->iLTRRefNum = pCfg->bEnableLongTermReference ? WELS_CLIP3(pCfg->iLTRRefNum,1,LONG_TERM_REF_NUM) : 0; pCfg->iLTRRefNum = pCfg->bEnableLongTermReference ? WELS_CLIP3(pCfg->iLTRRefNum,1,LONG_TERM_REF_NUM) : 0;