Fix the bug that the pDec not set to NULL when early exit Add more judgement for diff set EC mode under no-delay call

Haibo Zhu committed 11 years ago

Commit 264cf571 parent 9a55a861 file · +4 −0Browse files

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

Unified · Split

codec/decoder/core/src/decoder_core.cpp+4−0

@@ -2078,6 +2078,8 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 2077 unmodified lines
2078	2078	"reference picture introduced by this frame is lost during transmission! uiTId: %d",
2079	2079	pNalCur->sNalHeaderExt.uiTemporalId);
2080	2080	if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) {
	2081	+ if (pCtx->iTotalNumMbRec == 0)
	2082	+ pCtx->pDec = NULL;
2081	2083	return iRet;
2082	2084	}
2083	2085	}
@@ -2093,6 +2095,8 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 9 unmodified lines
2093	2095	bAllRefComplete = false;
2094	2096	HandleReferenceLostL0 (pCtx, pNalCur);
2095	2097	if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) {
	2098	+ if (pCtx->iTotalNumMbRec == 0)
	2099	+ pCtx->pDec = NULL;
2096	2100	return iRet;
2097	2101	}
2098	2102	}