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

bugfix for HW decoding green issue

Browse Source
This commit is contained in:
huili2 2015-04-10 12:23:43 +08:00
parent 78ab4000c0
commit cf3845779f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codec/decoder/core/src/decoder_core.cpp
View File

@ -112,8 +112,6 @@ static inline int32_t DecodeFrameConstruction (PWelsDecoderContext pCtx, uint8_t
pDstBuf += pPpsBs->uiPpsBsLen; pDstBuf += pPpsBs->uiPpsBsLen;
pCtx->bFrameFinish = false; pCtx->bFrameFinish = false;
} }
} else { //IDR required SPS, PPS
pCtx->bFrameFinish = true;
} }
//then VCL data re-write //then VCL data re-write
while (iIdx <= iEndIdx) { while (iIdx <= iEndIdx) {
@ -127,9 +125,11 @@ static inline int32_t DecodeFrameConstruction (PWelsDecoderContext pCtx, uint8_t
if (pCtx->iTotalNumMbRec == kiTotalNumMbInCurLayer) { //frame complete if (pCtx->iTotalNumMbRec == kiTotalNumMbInCurLayer) { //frame complete
pCtx->iTotalNumMbRec = 0; pCtx->iTotalNumMbRec = 0;
pCtx->bFramePending = false; pCtx->bFramePending = false;
pCtx->bFrameFinish = true; //finish current frame and mark it
} else if (pCtx->iTotalNumMbRec != 0) { //frame incomplete } else if (pCtx->iTotalNumMbRec != 0) { //frame incomplete
pCtx->bFramePending = true; pCtx->bFramePending = true;
pCtx->pDec->bIsComplete = false; pCtx->pDec->bIsComplete = false;
pCtx->bFrameFinish = false; //current frame not finished
pCtx->iErrorCode |= dsFramePending; pCtx->iErrorCode |= dsFramePending;
return -1; return -1;
//pCtx->pParserBsInfo->iNalNum = 0; //pCtx->pParserBsInfo->iNalNum = 0;
@ -2100,6 +2100,8 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf
return ERR_INFO_REF_COUNT_OVERFLOW; return ERR_INFO_REF_COUNT_OVERFLOW;
} }
pCtx->pDec->bNewSeqBegin = pCtx->bNewSeqBegin; //set flag for start decoding pCtx->pDec->bNewSeqBegin = pCtx->bNewSeqBegin; //set flag for start decoding
} else if (pCtx->iTotalNumMbRec == 0) { //pDec != NULL, already start
pCtx->pDec->bNewSeqBegin = pCtx->bNewSeqBegin; //set flag for start decoding
} }
pCtx->pDec->uiTimeStamp = pNalCur->uiTimeStamp; pCtx->pDec->uiTimeStamp = pNalCur->uiTimeStamp;