Showing the changes to codec/decoder/core/src/au_parser.cpp (1 of 13 files). Show all
Unified · Split
| @@ -192,7 +192,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 191 unmodified lines | |||
| 192 | 192 | ||
| 193 | if (uiAvailNalNum > 0) { | 193 | if (uiAvailNalNum > 0) { |
| 194 | pCurAu->uiEndPos = uiAvailNalNum - 1; | 194 | pCurAu->uiEndPos = uiAvailNalNum - 1; |
| 195 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) { | 195 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 196 | pCtx->bAuReadyFlag = true; | 196 | pCtx->bAuReadyFlag = true; |
| 197 | } | 197 | } |
| 198 | } | 198 | } |
| @@ -211,7 +211,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 12 unmodified lines | |||
| 211 | 211 | ||
| 212 | if (uiAvailNalNum > 0) { | 212 | if (uiAvailNalNum > 0) { |
| 213 | pCurAu->uiEndPos = uiAvailNalNum - 1; | 213 | pCurAu->uiEndPos = uiAvailNalNum - 1; |
| 214 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) { | 214 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 215 | pCtx->bAuReadyFlag = true; | 215 | pCtx->bAuReadyFlag = true; |
| 216 | } | 216 | } |
| 217 | } | 217 | } |
| @@ -327,7 +327,8 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 109 unmodified lines | |||
| 327 | return NULL; | 327 | return NULL; |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | if ((uiAvailNalNum == 1) && CheckNextAuNewSeq (pCtx, pCurNal, pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps)) { | 330 | if ((uiAvailNalNum == 1) |
| 331 | && CheckNextAuNewSeq (pCtx, pCurNal, pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps)) { | ||
| 331 | ResetActiveSPSForEachLayer (pCtx); | 332 | ResetActiveSPSForEachLayer (pCtx); |
| 332 | } | 333 | } |
| 333 | if ((uiAvailNalNum > 1) && | 334 | if ((uiAvailNalNum > 1) && |
| @@ -508,7 +509,7 @@ int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t · 174 unmodified lines | |||
| 508 | InitBits (pBs, pRbsp, iBitSize); | 509 | InitBits (pBs, pRbsp, iBitSize); |
| 509 | iErr = ParseSps (pCtx, pBs, &iPicWidth, &iPicHeight); | 510 | iErr = ParseSps (pCtx, pBs, &iPicWidth, &iPicHeight); |
| 510 | if (ERR_NONE != iErr) { // modified for pSps/pSubsetSps invalid, 12/1/2009 | 511 | if (ERR_NONE != iErr) { // modified for pSps/pSubsetSps invalid, 12/1/2009 |
| 511 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) | 512 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) |
| 512 | pCtx->iErrorCode |= dsNoParamSets; | 513 | pCtx->iErrorCode |= dsNoParamSets; |
| 513 | else | 514 | else |
| 514 | pCtx->iErrorCode |= dsBitstreamError; | 515 | pCtx->iErrorCode |= dsBitstreamError; |
| @@ -522,7 +523,7 @@ int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t · 7 unmodified lines | |||
| 522 | InitBits (pBs, pRbsp, iBitSize); | 523 | InitBits (pBs, pRbsp, iBitSize); |
| 523 | iErr = ParsePps (pCtx, &pCtx->sPpsBuffer[0], pBs); | 524 | iErr = ParsePps (pCtx, &pCtx->sPpsBuffer[0], pBs); |
| 524 | if (ERR_NONE != iErr) { // modified for pps invalid, 12/1/2009 | 525 | if (ERR_NONE != iErr) { // modified for pps invalid, 12/1/2009 |
| 525 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) | 526 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) |
| 526 | pCtx->iErrorCode |= dsNoParamSets; | 527 | pCtx->iErrorCode |= dsNoParamSets; |
| 527 | else | 528 | else |
| 528 | pCtx->iErrorCode |= dsBitstreamError; | 529 | pCtx->iErrorCode |= dsBitstreamError; |