History

Merge pull request #718 from huili2/LTR_feedback_info

modify sequence to fix bug for LTR feedback info

Licai Guo committed 12 years ago

Commit 7dfc49e2 parents c01b0f4 0c45cbb1 file · +4 −4Browse files

Showing the changes to codec/decoder/core/src (1 of 1 file). Show all

Unified · Split

codec/decoder/core/src/manage_dec_ref.cpp+4−4
@@ -333,15 +333,15 @@ static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, · 332 unmodified lines
333333 if (iLongTermFrameIdx > pRefPic->iMaxLongTermFrameIdx) {
334334 return ERR_INFO_INVALID_MMCO_LONG_TERM_IDX_EXCEED_MAX;
335335 }
336+ WelsDelLongFromListSetUnref (pRefPic, iLongTermFrameIdx);
337+ if (pRefPic->uiLongRefCount[LIST_0] + pRefPic->uiShortRefCount[LIST_0] >= WELS_MAX(1,pCtx->pSps->iNumRefFrames)) {
338+ return ERR_INFO_INVALID_MMCO_REF_NUM_OVERFLOW;
339+ }
336340 #ifdef LONG_TERM_REF
337341 pCtx->bCurAuContainLtrMarkSeFlag = true;
338342 pCtx->iFrameNumOfAuMarkedLtr = pCtx->iFrameNum;
339343 WelsLog (pCtx, WELS_LOG_INFO, "ex_mark_avc():::MMCO_LONG:::LTR marking....iFrameNum: %d\n", pCtx->iFrameNum);
340344 #endif
341− WelsDelLongFromListSetUnref (pRefPic, iLongTermFrameIdx);
342− if (pRefPic->uiLongRefCount[LIST_0] + pRefPic->uiShortRefCount[LIST_0] >= WELS_MAX(1,pCtx->pSps->iNumRefFrames)) {
343− return ERR_INFO_INVALID_MMCO_REF_NUM_OVERFLOW;
344− }
345345 iRet = AddLongTermToList (pRefPic, pCtx->pDec, iLongTermFrameIdx);
346346 break;
347347 default :

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t