Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 1 file). Show all
Unified · Split
| @@ -131,8 +131,9 @@ static inline int32_t DecodeFrameConstruction (PWelsDecoderContext pCtx, uint8_t · 130 unmodified lines | |||
| 131 | pParser->iNalLenInByte [pParser->iNalNum ++] = iNalLen; | 131 | pParser->iNalLenInByte [pParser->iNalNum ++] = iNalLen; |
| 132 | if (pDstBuf - pParser->pDstBuff + iNalLen >= MAX_ACCESS_UNIT_CAPACITY) { | 132 | if (pDstBuf - pParser->pDstBuff + iNalLen >= MAX_ACCESS_UNIT_CAPACITY) { |
| 133 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, | 133 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, |
| 134 | "DecodeFrameConstruction(): composed output size (%ld) exceeds (%d). Failed to parse. \n", | 134 | "DecodeFrameConstruction(): composed output size (%ld) exceeds (%d). Failed to parse. current data pos %d out of %d:, previously accumulated num: %d, total num: %d, previously accumulated len: %d, current len: %d, current buf pos: %p, header buf pos: %p \n", |
| 135 | (long) (pDstBuf - pParser->pDstBuff + iNalLen), MAX_ACCESS_UNIT_CAPACITY); | 135 | (long) (pDstBuf - pParser->pDstBuff + iNalLen), MAX_ACCESS_UNIT_CAPACITY, iIdx, iEndIdx, iNum, pParser->iNalNum, |
| 136 | iTotalNalLen, iNalLen, pDstBuf, pParser->pDstBuff); | ||
| 136 | pCtx->iErrorCode |= dsOutOfMemory; | 137 | pCtx->iErrorCode |= dsOutOfMemory; |
| 137 | pCtx->pParserBsInfo->iNalNum = 0; | 138 | pCtx->pParserBsInfo->iNalNum = 0; |
| 138 | return ERR_INFO_OUT_OF_MEMORY; | 139 | return ERR_INFO_OUT_OF_MEMORY; |
| @@ -2260,11 +2261,11 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 2121 unmodified lines | |||
| 2260 | if (ERR_NONE != iRet) { | 2261 | if (ERR_NONE != iRet) { |
| 2261 | if (iRet == ERR_INFO_OUT_OF_MEMORY) { | 2262 | if (iRet == ERR_INFO_OUT_OF_MEMORY) { |
| 2262 | pCtx->iErrorCode |= dsOutOfMemory; | 2263 | pCtx->iErrorCode |= dsOutOfMemory; |
| 2263 | WelsLog (&(pCtx->sLogCtx), WELS_LOG_ERROR, "DecodeCurrentAccessUnit(), Fmo param alloc failed"); | 2264 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "DecodeCurrentAccessUnit(), Fmo param alloc failed"); |
| 2264 | } else { | 2265 | } else { |
| 2265 | pCtx->iErrorCode |= dsBitstreamError; | 2266 | pCtx->iErrorCode |= dsBitstreamError; |
| 2266 | WelsLog(&(pCtx->sLogCtx), WELS_LOG_WARNING, "DecodeCurrentAccessUnit(), FmoParamUpdate failed, eSliceType: %d.", | 2267 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "DecodeCurrentAccessUnit(), FmoParamUpdate failed, eSliceType: %d.", |
| 2267 | pSh->eSliceType); | 2268 | pSh->eSliceType); |
| 2268 | } | 2269 | } |
| 2269 | return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_FMO_INIT_FAIL); | 2270 | return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_FMO_INIT_FAIL); |
| 2270 | } | 2271 | } |