Bugzilla 1479656, 1485229 and 1486223 fixes without mixing with other update.

xiaotiansf committed 7 years ago

Commit 9461ae81 parent 63a546e4 files · +17 −16Browse 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+5−1

@@ -825,7 +825,11 @@ int32_t SyncPictureResolutionExt (PWelsDecoderContext pCtx, const int32_t kiMbWi · 824 unmodified lines
825	int32_t iErr = ERR_NONE;	825	int32_t iErr = ERR_NONE;
826	const int32_t kiPicWidth = kiMbWidth << 4;	826	const int32_t kiPicWidth = kiMbWidth << 4;
827	const int32_t kiPicHeight = kiMbHeight << 4;	827	const int32_t kiPicHeight = kiMbHeight << 4;
828		828	//fix Bugzilla Bug1479656 reallocate temp dec picture
		829	if (pCtx->pTempDec != NULL) {
		830	FreePicture (pCtx->pTempDec, pCtx->pMemAlign);
		831	pCtx->pTempDec = AllocPicture (pCtx, pCtx->pSps->iMbWidth << 4, pCtx->pSps->iMbHeight << 4);
		832	}
829	bool bReallocFlag = false;	833	bool bReallocFlag = false;
830	iErr = WelsRequestMem (pCtx, kiMbWidth, kiMbHeight, bReallocFlag); // common memory used	834	iErr = WelsRequestMem (pCtx, kiMbWidth, kiMbHeight, bReallocFlag); // common memory used
831	if (ERR_NONE != iErr) {	835	if (ERR_NONE != iErr) {