Showing the changes to codec/decoder/core/src/decoder.cpp (1 of 2 files). Show all
Unified · Split
| @@ -474,7 +474,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 473 unmodified lines | |||
| 474 | #else | 474 | #else |
| 475 | pCtx->bReferenceLostAtT0Flag = true; | 475 | pCtx->bReferenceLostAtT0Flag = true; |
| 476 | #endif | 476 | #endif |
| 477 | ResetParameterSetsState (pCtx); | 477 | if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) |
| 478 | ResetParameterSetsState (pCtx); | ||
| 478 | 479 | ||
| 479 | if (dsOutOfMemory & pCtx->iErrorCode) { | 480 | if (dsOutOfMemory & pCtx->iErrorCode) { |
| 480 | return pCtx->iErrorCode; | 481 | return pCtx->iErrorCode; |
| @@ -489,7 +490,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 8 unmodified lines | |||
| 489 | #else | 490 | #else |
| 490 | pCtx->bReferenceLostAtT0Flag = true; | 491 | pCtx->bReferenceLostAtT0Flag = true; |
| 491 | #endif | 492 | #endif |
| 492 | ResetParameterSetsState (pCtx); | 493 | if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) |
| 494 | ResetParameterSetsState (pCtx); | ||
| 493 | } | 495 | } |
| 494 | return pCtx->iErrorCode; | 496 | return pCtx->iErrorCode; |
| 495 | } | 497 | } |
| @@ -532,7 +534,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 36 unmodified lines | |||
| 532 | #else | 534 | #else |
| 533 | pCtx->bReferenceLostAtT0Flag = true; | 535 | pCtx->bReferenceLostAtT0Flag = true; |
| 534 | #endif | 536 | #endif |
| 535 | ResetParameterSetsState (pCtx); | 537 | if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) |
| 538 | ResetParameterSetsState (pCtx); | ||
| 536 | return pCtx->iErrorCode; | 539 | return pCtx->iErrorCode; |
| 537 | } | 540 | } |
| 538 | } | 541 | } |
| @@ -567,7 +570,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 28 unmodified lines | |||
| 567 | #else | 570 | #else |
| 568 | pCtx->bReferenceLostAtT0Flag = true; | 571 | pCtx->bReferenceLostAtT0Flag = true; |
| 569 | #endif | 572 | #endif |
| 570 | ResetParameterSetsState (pCtx); | 573 | if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode)) |
| 574 | ResetParameterSetsState (pCtx); | ||
| 571 | return pCtx->iErrorCode; | 575 | return pCtx->iErrorCode; |
| 572 | } | 576 | } |
| 573 | } | 577 | } |