Showing the changes to codec/decoder/core/src/decoder.cpp (1 of 13 files). Show all
Unified · Split
| @@ -160,7 +160,7 @@ void WelsDecoderDefaults (PWelsDecoderContext pCtx, SLogContext* pLogCtx) { · 159 unmodified lines | ||
| 160 | 160 | pCtx->pPicBuff[LIST_1] = NULL; |
| 161 | 161 | |
| 162 | 162 | pCtx->bAvcBasedFlag = true; |
| 163 | − pCtx->iErrorConMethod = ERROR_CON_SLICE_COPY; | |
| 163 | + pCtx->eErrorConMethod = ERROR_CON_SLICE_COPY; | |
| 164 | 164 | pCtx->pPreviousDecodedPictureInDpb = NULL; |
| 165 | 165 | |
| 166 | 166 | } |
| @@ -332,7 +332,7 @@ int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const SDecodingParam* kpPa · 165 unmodified lines | ||
| 332 | 332 | |
| 333 | 333 | memcpy (pCtx->pParam, kpParam, sizeof (SDecodingParam)); |
| 334 | 334 | pCtx->iOutputColorFormat = pCtx->pParam->iOutputColorFormat; |
| 335 | − pCtx->bErrorResilienceFlag = pCtx->pParam->uiEcActiveFlag ? true : false; | |
| 335 | + pCtx->eErrorConMethod = pCtx->pParam->eEcActiveIdc; | |
| 336 | 336 | |
| 337 | 337 | if (VIDEO_BITSTREAM_SVC == pCtx->pParam->sVideoProperty.eVideoBsType || |
| 338 | 338 | VIDEO_BITSTREAM_AVC == pCtx->pParam->sVideoProperty.eVideoBsType) { |
| @@ -462,7 +462,7 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 123 unmodified lines | ||
| 462 | 462 | |
| 463 | 463 | iConsumedBytes = 0; |
| 464 | 464 | pNalPayload = ParseNalHeader (pCtx, &pCtx->sCurNalHead, pDstNal, iDstIdx, pSrcNal - 3, iSrcIdx + 3, &iConsumedBytes); |
| 465 | − if ((pCtx->iErrorConMethod != ERROR_CON_DISABLE) && (IS_VCL_NAL (pCtx->sCurNalHead.eNalUnitType, 1))) { | |
| 465 | + if ((pCtx->eErrorConMethod != ERROR_CON_DISABLE) && (IS_VCL_NAL (pCtx->sCurNalHead.eNalUnitType, 1))) { | |
| 466 | 466 | CheckAndDoEC (pCtx, ppDst, pDstBufInfo); |
| 467 | 467 | } |
| 468 | 468 | if (IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) && pNalPayload) { |
| @@ -477,7 +477,7 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 8 unmodified lines | ||
| 477 | 477 | #else |
| 478 | 478 | pCtx->bReferenceLostAtT0Flag = true; |
| 479 | 479 | #endif |
| 480 | − if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) | |
| 480 | + if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) | |
| 481 | 481 | ResetParameterSetsState (pCtx); |
| 482 | 482 | |
| 483 | 483 | if (dsOutOfMemory & pCtx->iErrorCode) { |
| @@ -493,7 +493,7 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 9 unmodified lines | ||
| 493 | 493 | #else |
| 494 | 494 | pCtx->bReferenceLostAtT0Flag = true; |
| 495 | 495 | #endif |
| 496 | − if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) | |
| 496 | + if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) | |
| 497 | 497 | ResetParameterSetsState (pCtx); |
| 498 | 498 | } |
| 499 | 499 | return pCtx->iErrorCode; |
| @@ -522,7 +522,7 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 22 unmodified lines | ||
| 522 | 522 | |
| 523 | 523 | iConsumedBytes = 0; |
| 524 | 524 | pNalPayload = ParseNalHeader (pCtx, &pCtx->sCurNalHead, pDstNal, iDstIdx, pSrcNal - 3, iSrcIdx + 3, &iConsumedBytes); |
| 525 | − if ((pCtx->iErrorConMethod != ERROR_CON_DISABLE) && (IS_VCL_NAL (pCtx->sCurNalHead.eNalUnitType, 1))) { | |
| 525 | + if ((pCtx->eErrorConMethod != ERROR_CON_DISABLE) && (IS_VCL_NAL (pCtx->sCurNalHead.eNalUnitType, 1))) { | |
| 526 | 526 | CheckAndDoEC (pCtx, ppDst, pDstBufInfo); |
| 527 | 527 | } |
| 528 | 528 | if (IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) && pNalPayload) { |
| @@ -537,7 +537,7 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 8 unmodified lines | ||
| 537 | 537 | #else |
| 538 | 538 | pCtx->bReferenceLostAtT0Flag = true; |
| 539 | 539 | #endif |
| 540 | − if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) | |
| 540 | + if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) | |
| 541 | 541 | ResetParameterSetsState (pCtx); |
| 542 | 542 | return pCtx->iErrorCode; |
| 543 | 543 | } |
| @@ -573,7 +573,7 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 29 unmodified lines | ||
| 573 | 573 | #else |
| 574 | 574 | pCtx->bReferenceLostAtT0Flag = true; |
| 575 | 575 | #endif |
| 576 | − if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) | |
| 576 | + if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) | |
| 577 | 577 | ResetParameterSetsState (pCtx); |
| 578 | 578 | return pCtx->iErrorCode; |
| 579 | 579 | } |