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

Merge pull request #622 from ruil2/dpb_ltr

Browse Source 
add LTR processing in reference frame management
This commit is contained in:
sijchen 2014-04-02 16:46:16 +08:00
commit c43e1c8f43
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
codec/encoder/core/src/ref_list_mgr_svc.cpp
View File

@ -115,6 +115,18 @@ static inline void DeleteSTRFromShortList (sWelsEncCtx* pCtx, int32_t iIdx) {
pRefList->uiShortRefCount--;
}
static void DeleteNonSceneLTR (sWelsEncCtx* pCtx) {
SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
for (int32_t i = 0; i < pCtx->pSvcParam->iNumRefFrame; ++i) {
SPicture* pRef = pRefList->pLongRefList[i];
if (pRef != NULL && pRef->bUsedAsRef && pRef->bIsLongRef && (!pRef->bIsSceneLTR) &&
(pCtx->uiTemporalId < pRef->uiTemporalId || pCtx->bCurFrameMarkedAsSceneLtr)) {
SetUnref (pRef);
DeleteLTRFromLongList (pCtx, i);
}
}
}
static inline int32_t CompareFrameNum (int32_t iFrameNumA, int32_t iFrameNumB, int32_t iMaxFrameNumPlus1) {
int64_t iNumA, iNumB, iDiffAB, iDiffMin;
if (iFrameNumA > iMaxFrameNumPlus1 || iFrameNumB > iMaxFrameNumPlus1) {
@ -300,6 +312,21 @@ static inline void LTRMarkProcess (sWelsEncCtx* pCtx) {
DeleteSTRFromShortList (pCtx, i);
}
}
static inline void LTRMarkProcessScreen (sWelsEncCtx* pCtx) {
SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
SPicture** pLongRefList = pRefList->pLongRefList;
int32_t iLtrIdx = pCtx->pDecPic->iLongTermPicNum;
pCtx->pVaa->uiMarkLongTermPicIdx = pCtx->pDecPic->iLongTermPicNum;
if (pLongRefList[iLtrIdx] != NULL) {
SetUnref (pLongRefList[iLtrIdx]);
DeleteLTRFromLongList (pCtx, iLtrIdx);
}
pLongRefList[iLtrIdx] = pCtx->pDecPic;
pRefList->uiLongRefCount;
}
static inline void PrefetchNextBuffer (sWelsEncCtx* pCtx) {
SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
const int32_t kiNumRef = pCtx->pSvcParam->iNumRefFrame;
@ -669,11 +696,12 @@ bool WelsUpdateRefListScreen (void* pEncCtx) {
pCtx->pDecPic->iLongTermPicNum = pLtr->iCurLtrIdx;
}
if (pCtx->eSliceType == P_SLICE) {
//TBD LTR mark
DeleteNonSceneLTR (pCtx);
LTRMarkProcessScreen (pCtx);
pLtr->bLTRMarkingFlag = false;
++pLtr->uiLtrMarkInterval;
} else { // in case IDR currently coding
//TBD LTR mark
LTRMarkProcessScreen (pCtx);
pLtr->iCurLtrIdx = 1;
pLtr->iSceneLtrIdx = 1;
pLtr->uiLtrMarkInterval = 0;