Showing the changes to codec/decoder/core/src/au_parser.cpp (1 of 3 files). Show all
Unified · Split
| @@ -271,7 +271,9 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 270 unmodified lines | |||
| 271 | 271 | ||
| 272 | if (uiAvailNalNum > 1) { | 272 | if (uiAvailNalNum > 1) { |
| 273 | pCurAu->uiEndPos = uiAvailNalNum - 2; | 273 | pCurAu->uiEndPos = uiAvailNalNum - 2; |
| 274 | pCtx->bAuReadyFlag = true; | 274 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 275 | pCtx->bAuReadyFlag = true; | ||
| 276 | } | ||
| 275 | } | 277 | } |
| 276 | pCtx->iErrorCode |= dsBitstreamError; | 278 | pCtx->iErrorCode |= dsBitstreamError; |
| 277 | return NULL; | 279 | return NULL; |
| @@ -291,7 +293,9 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 13 unmodified lines | |||
| 291 | 293 | ||
| 292 | if (uiAvailNalNum > 1) { | 294 | if (uiAvailNalNum > 1) { |
| 293 | pCurAu->uiEndPos = uiAvailNalNum - 2; | 295 | pCurAu->uiEndPos = uiAvailNalNum - 2; |
| 294 | pCtx->bAuReadyFlag = true; | 296 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 297 | pCtx->bAuReadyFlag = true; | ||
| 298 | } | ||
| 295 | } | 299 | } |
| 296 | pCtx->iErrorCode |= dsBitstreamError; | 300 | pCtx->iErrorCode |= dsBitstreamError; |
| 297 | return NULL; | 301 | return NULL; |
| @@ -340,7 +344,9 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 42 unmodified lines | |||
| 340 | ForceClearCurrentNal (pCurAu); | 344 | ForceClearCurrentNal (pCurAu); |
| 341 | if (uiAvailNalNum > 1) { | 345 | if (uiAvailNalNum > 1) { |
| 342 | pCurAu->uiEndPos = uiAvailNalNum - 2; | 346 | pCurAu->uiEndPos = uiAvailNalNum - 2; |
| 343 | pCtx->bAuReadyFlag = true; | 347 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 348 | pCtx->bAuReadyFlag = true; | ||
| 349 | } | ||
| 344 | } | 350 | } |
| 345 | WelsLog (pLogCtx, WELS_LOG_ERROR, "NAL_UNIT_CODED_SLICE: InitBits() fail due invalid access."); | 351 | WelsLog (pLogCtx, WELS_LOG_ERROR, "NAL_UNIT_CODED_SLICE: InitBits() fail due invalid access."); |
| 346 | pCtx->iErrorCode |= dsBitstreamError; | 352 | pCtx->iErrorCode |= dsBitstreamError; |
| @@ -357,7 +363,9 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 10 unmodified lines | |||
| 357 | 363 | ||
| 358 | if (uiAvailNalNum > 1) { | 364 | if (uiAvailNalNum > 1) { |
| 359 | pCurAu->uiEndPos = uiAvailNalNum - 2; | 365 | pCurAu->uiEndPos = uiAvailNalNum - 2; |
| 360 | pCtx->bAuReadyFlag = true; | 366 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 367 | pCtx->bAuReadyFlag = true; | ||
| 368 | } | ||
| 361 | } | 369 | } |
| 362 | pCtx->iErrorCode |= dsBitstreamError; | 370 | pCtx->iErrorCode |= dsBitstreamError; |
| 363 | return NULL; | 371 | return NULL; |