Showing the changes to codec/decoder/core/src/decode_slice.cpp (1 of 14 files). Show all
Unified · Split
| @@ -102,7 +102,7 @@ int32_t WelsTargetSliceConstruction (PWelsDecoderContext pCtx) { · 101 unmodified lines | |||
| 102 | break; | 102 | break; |
| 103 | } | 103 | } |
| 104 | if (pCtx->iTotalNumMbRec > iTotalMbTargetLayer) { | 104 | if (pCtx->iTotalNumMbRec > iTotalMbTargetLayer) { |
| 105 | WelsLog (pCtx, WELS_LOG_WARNING, "WelsTargetSliceConstruction():::pCtx->iTotalNumMbRec:%d, iTotalMbTargetLayer:%d\n", | 105 | WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "WelsTargetSliceConstruction():::pCtx->iTotalNumMbRec:%d, iTotalMbTargetLayer:%d\n", |
| 106 | pCtx->iTotalNumMbRec, iTotalMbTargetLayer); | 106 | pCtx->iTotalNumMbRec, iTotalMbTargetLayer); |
| 107 | 107 | ||
| 108 | return -1; | 108 | return -1; |
| @@ -284,7 +284,7 @@ int32_t WelsTargetMbConstruction (PWelsDecoderContext pCtx) { · 175 unmodified lines | |||
| 284 | WelsMbInterConstruction (pCtx, pCurLayer); | 284 | WelsMbInterConstruction (pCtx, pCurLayer); |
| 285 | } | 285 | } |
| 286 | } else { | 286 | } else { |
| 287 | WelsLog (pCtx, WELS_LOG_WARNING, "WelsTargetMbConstruction():::::Unknown MB type: %d\n", | 287 | WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "WelsTargetMbConstruction():::::Unknown MB type: %d\n", |
| 288 | pCurLayer->pMbType[pCurLayer->iMbXyIndex]); | 288 | pCurLayer->pMbType[pCurLayer->iMbXyIndex]); |
| 289 | return -1; | 289 | return -1; |
| 290 | } | 290 | } |
| @@ -414,7 +414,7 @@ int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNal · 123 unmodified lines | |||
| 414 | break; | 414 | break; |
| 415 | } | 415 | } |
| 416 | if (iUsedBits > pBs->iBits) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash. | 416 | if (iUsedBits > pBs->iBits) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash. |
| 417 | WelsLog (pCtx, WELS_LOG_WARNING, | 417 | WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, |
| 418 | "WelsDecodeSlice()::::pBs incomplete, iUsedBits:%"PRId64" > pBs->iBits:%d, MUST stop decoding.\n", | 418 | "WelsDecodeSlice()::::pBs incomplete, iUsedBits:%"PRId64" > pBs->iBits:%d, MUST stop decoding.\n", |
| 419 | (int64_t) iUsedBits, pBs->iBits); | 419 | (int64_t) iUsedBits, pBs->iBits); |
| 420 | return -1; | 420 | return -1; |
| @@ -685,7 +685,7 @@ int32_t WelsDecodeMbCavlcISlice (PWelsDecoderContext pCtx, PNalUnit pNalCur) { · 264 unmodified lines | |||
| 685 | if (!iBaseModeFlag) { | 685 | if (!iBaseModeFlag) { |
| 686 | iRet = WelsActualDecodeMbCavlcISlice (pCtx); | 686 | iRet = WelsActualDecodeMbCavlcISlice (pCtx); |
| 687 | } else { | 687 | } else { |
| 688 | WelsLog (pCtx, WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.\n", iBaseModeFlag); | 688 | WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.\n", iBaseModeFlag); |
| 689 | return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP); | 689 | return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP); |
| 690 | } | 690 | } |
| 691 | if (iRet) { //occur error when parsing, MUST STOP decoding | 691 | if (iRet) { //occur error when parsing, MUST STOP decoding |
| @@ -741,7 +741,7 @@ int32_t WelsActualDecodeMbCavlcPSlice (PWelsDecoderContext pCtx) { · 49 unmodified lines | |||
| 741 | if (pCurLayer->pResidualPredFlag[iMbXy] == 0) { | 741 | if (pCurLayer->pResidualPredFlag[iMbXy] == 0) { |
| 742 | pCurLayer->pInterPredictionDoneFlag[iMbXy] = 0; | 742 | pCurLayer->pInterPredictionDoneFlag[iMbXy] = 0; |
| 743 | } else { | 743 | } else { |
| 744 | WelsLog (pCtx, WELS_LOG_WARNING, "residual_pred_flag = 1 not supported.\n"); | 744 | WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "residual_pred_flag = 1 not supported.\n"); |
| 745 | return -1; | 745 | return -1; |
| 746 | } | 746 | } |
| 747 | } else { //intra MB type | 747 | } else { //intra MB type |
| @@ -1037,7 +1037,7 @@ int32_t WelsDecodeMbCavlcPSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur) { · 289 unmodified lines | |||
| 1037 | if (!iBaseModeFlag) { | 1037 | if (!iBaseModeFlag) { |
| 1038 | iRet = WelsActualDecodeMbCavlcPSlice (pCtx); | 1038 | iRet = WelsActualDecodeMbCavlcPSlice (pCtx); |
| 1039 | } else { | 1039 | } else { |
| 1040 | WelsLog (pCtx, WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.\n", iBaseModeFlag); | 1040 | WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.\n", iBaseModeFlag); |
| 1041 | return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP); | 1041 | return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP); |
| 1042 | } | 1042 | } |
| 1043 | if (iRet) { //occur error when parsing, MUST STOP decoding | 1043 | if (iRet) { //occur error when parsing, MUST STOP decoding |