Showing the changes to codec/decoder/core/src/au_parser.cpp (1 of 10 files). Show all
Unified · Split
| @@ -208,7 +208,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 207 unmodified lines | |||
| 208 | 208 | ||
| 209 | if (uiAvailNalNum > 0) { | 209 | if (uiAvailNalNum > 0) { |
| 210 | pCurAu->uiEndPos = uiAvailNalNum - 1; | 210 | pCurAu->uiEndPos = uiAvailNalNum - 1; |
| 211 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { | 211 | if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) { |
| 212 | pCtx->bAuReadyFlag = true; | 212 | pCtx->bAuReadyFlag = true; |
| 213 | } | 213 | } |
| 214 | } | 214 | } |
| @@ -227,7 +227,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 12 unmodified lines | |||
| 227 | 227 | ||
| 228 | if (uiAvailNalNum > 0) { | 228 | if (uiAvailNalNum > 0) { |
| 229 | pCurAu->uiEndPos = uiAvailNalNum - 1; | 229 | pCurAu->uiEndPos = uiAvailNalNum - 1; |
| 230 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { | 230 | if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) { |
| 231 | pCtx->bAuReadyFlag = true; | 231 | pCtx->bAuReadyFlag = true; |
| 232 | } | 232 | } |
| 233 | } | 233 | } |
| @@ -284,7 +284,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 50 unmodified lines | |||
| 284 | 284 | ||
| 285 | if (uiAvailNalNum > 1) { | 285 | if (uiAvailNalNum > 1) { |
| 286 | pCurAu->uiEndPos = uiAvailNalNum - 2; | 286 | pCurAu->uiEndPos = uiAvailNalNum - 2; |
| 287 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { | 287 | if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) { |
| 288 | pCtx->bAuReadyFlag = true; | 288 | pCtx->bAuReadyFlag = true; |
| 289 | } | 289 | } |
| 290 | } | 290 | } |
| @@ -306,7 +306,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 15 unmodified lines | |||
| 306 | 306 | ||
| 307 | if (uiAvailNalNum > 1) { | 307 | if (uiAvailNalNum > 1) { |
| 308 | pCurAu->uiEndPos = uiAvailNalNum - 2; | 308 | pCurAu->uiEndPos = uiAvailNalNum - 2; |
| 309 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { | 309 | if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) { |
| 310 | pCtx->bAuReadyFlag = true; | 310 | pCtx->bAuReadyFlag = true; |
| 311 | } | 311 | } |
| 312 | } | 312 | } |
| @@ -381,7 +381,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 68 unmodified lines | |||
| 381 | ForceClearCurrentNal (pCurAu); | 381 | ForceClearCurrentNal (pCurAu); |
| 382 | if (uiAvailNalNum > 1) { | 382 | if (uiAvailNalNum > 1) { |
| 383 | pCurAu->uiEndPos = uiAvailNalNum - 2; | 383 | pCurAu->uiEndPos = uiAvailNalNum - 2; |
| 384 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { | 384 | if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) { |
| 385 | pCtx->bAuReadyFlag = true; | 385 | pCtx->bAuReadyFlag = true; |
| 386 | } | 386 | } |
| 387 | } | 387 | } |
| @@ -400,7 +400,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 12 unmodified lines | |||
| 400 | 400 | ||
| 401 | if (uiAvailNalNum > 1) { | 401 | if (uiAvailNalNum > 1) { |
| 402 | pCurAu->uiEndPos = uiAvailNalNum - 2; | 402 | pCurAu->uiEndPos = uiAvailNalNum - 2; |
| 403 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { | 403 | if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) { |
| 404 | pCtx->bAuReadyFlag = true; | 404 | pCtx->bAuReadyFlag = true; |
| 405 | } | 405 | } |
| 406 | } | 406 | } |
| @@ -589,7 +589,7 @@ int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t · 182 unmodified lines | |||
| 589 | if (iBitSize > 0) { | 589 | if (iBitSize > 0) { |
| 590 | iErr = DecInitBits (pBs, pRbsp, iBitSize); | 590 | iErr = DecInitBits (pBs, pRbsp, iBitSize); |
| 591 | if (ERR_NONE != iErr) { | 591 | if (ERR_NONE != iErr) { |
| 592 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) | 592 | if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) |
| 593 | pCtx->iErrorCode |= dsNoParamSets; | 593 | pCtx->iErrorCode |= dsNoParamSets; |
| 594 | else | 594 | else |
| 595 | pCtx->iErrorCode |= dsBitstreamError; | 595 | pCtx->iErrorCode |= dsBitstreamError; |
| @@ -598,7 +598,7 @@ int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t · 2 unmodified lines | |||
| 598 | } | 598 | } |
| 599 | iErr = ParseSps (pCtx, pBs, &iPicWidth, &iPicHeight, pSrcNal, kSrcNalLen); | 599 | iErr = ParseSps (pCtx, pBs, &iPicWidth, &iPicHeight, pSrcNal, kSrcNalLen); |
| 600 | if (ERR_NONE != iErr) { // modified for pSps/pSubsetSps invalid, 12/1/2009 | 600 | if (ERR_NONE != iErr) { // modified for pSps/pSubsetSps invalid, 12/1/2009 |
| 601 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) | 601 | if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) |
| 602 | pCtx->iErrorCode |= dsNoParamSets; | 602 | pCtx->iErrorCode |= dsNoParamSets; |
| 603 | else | 603 | else |
| 604 | pCtx->iErrorCode |= dsBitstreamError; | 604 | pCtx->iErrorCode |= dsBitstreamError; |
| @@ -611,7 +611,7 @@ int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t · 6 unmodified lines | |||
| 611 | if (iBitSize > 0) { | 611 | if (iBitSize > 0) { |
| 612 | iErr = DecInitBits (pBs, pRbsp, iBitSize); | 612 | iErr = DecInitBits (pBs, pRbsp, iBitSize); |
| 613 | if (ERR_NONE != iErr) { | 613 | if (ERR_NONE != iErr) { |
| 614 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) | 614 | if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) |
| 615 | pCtx->iErrorCode |= dsNoParamSets; | 615 | pCtx->iErrorCode |= dsNoParamSets; |
| 616 | else | 616 | else |
| 617 | pCtx->iErrorCode |= dsBitstreamError; | 617 | pCtx->iErrorCode |= dsBitstreamError; |
| @@ -620,7 +620,7 @@ int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t · 2 unmodified lines | |||
| 620 | } | 620 | } |
| 621 | iErr = ParsePps (pCtx, &pCtx->sPpsBuffer[0], pBs, pSrcNal, kSrcNalLen); | 621 | iErr = ParsePps (pCtx, &pCtx->sPpsBuffer[0], pBs, pSrcNal, kSrcNalLen); |
| 622 | if (ERR_NONE != iErr) { // modified for pps invalid, 12/1/2009 | 622 | if (ERR_NONE != iErr) { // modified for pps invalid, 12/1/2009 |
| 623 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) | 623 | if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) |
| 624 | pCtx->iErrorCode |= dsNoParamSets; | 624 | pCtx->iErrorCode |= dsNoParamSets; |
| 625 | else | 625 | else |
| 626 | pCtx->iErrorCode |= dsBitstreamError; | 626 | pCtx->iErrorCode |= dsBitstreamError; |