1. add encoder-engine-decoder API UT for: IDR request, LTR request 2. add decoder api UT for EC: Disable/Enable EC 3. Fix a decoder bug when EC is disabled itoltalMbDec should be set to zero when encouter a new sequence/picture, even when EC is disabled.

dongzha committed 12 years ago

Commit 311f7001 parent 679cc4a4 files · +527 −26Browse files

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

Unified · Split

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

@@ -462,8 +462,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 461 unmodified lines
462		462
463	iConsumedBytes = 0;	463	iConsumedBytes = 0;
464	pNalPayload = ParseNalHeader (pCtx, &pCtx->sCurNalHead, pDstNal, iDstIdx, pSrcNal - 3, iSrcIdx + 3, &iConsumedBytes);	464	pNalPayload = ParseNalHeader (pCtx, &pCtx->sCurNalHead, pDstNal, iDstIdx, pSrcNal - 3, iSrcIdx + 3, &iConsumedBytes);
465	if ((pCtx->eErrorConMethod != ERROR_CON_DISABLE) && (IS_VCL_NAL (pCtx->sCurNalHead.eNalUnitType, 1))) {	465	if (IS_VCL_NAL (pCtx->sCurNalHead.eNalUnitType, 1)) {
466	CheckAndDoEC (pCtx, ppDst, pDstBufInfo);	466	CheckAndFinishLastPic (pCtx, ppDst, pDstBufInfo);
467	}	467	}
468	if (IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) && pNalPayload) {	468	if (IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) && pNalPayload) {
469	iRet = ParseNonVclNal (pCtx, pNalPayload, iDstIdx - iConsumedBytes);	469	iRet = ParseNonVclNal (pCtx, pNalPayload, iDstIdx - iConsumedBytes);
@@ -522,8 +522,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 52 unmodified lines
522		522
523	iConsumedBytes = 0;	523	iConsumedBytes = 0;
524	pNalPayload = ParseNalHeader (pCtx, &pCtx->sCurNalHead, pDstNal, iDstIdx, pSrcNal - 3, iSrcIdx + 3, &iConsumedBytes);	524	pNalPayload = ParseNalHeader (pCtx, &pCtx->sCurNalHead, pDstNal, iDstIdx, pSrcNal - 3, iSrcIdx + 3, &iConsumedBytes);
525	if ((pCtx->eErrorConMethod != ERROR_CON_DISABLE) && (IS_VCL_NAL (pCtx->sCurNalHead.eNalUnitType, 1))) {	525	if (IS_VCL_NAL (pCtx->sCurNalHead.eNalUnitType, 1)) {
526	CheckAndDoEC (pCtx, ppDst, pDstBufInfo);	526	CheckAndFinishLastPic (pCtx, ppDst, pDstBufInfo);
527	}	527	}
528	if (IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) && pNalPayload) {	528	if (IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) && pNalPayload) {
529	iRet = ParseNonVclNal (pCtx, pNalPayload, iDstIdx - iConsumedBytes);	529	iRet = ParseNonVclNal (pCtx, pNalPayload, iDstIdx - iConsumedBytes);