Showing the changes to codec/decoder/core/src/decode_slice.cpp (1 of 16 files). Show all
Unified · Split
| @@ -91,7 +91,7 @@ int32_t WelsTargetSliceConstruction (PWelsDecoderContext pCtx) { · 90 unmodified lines | |||
| 91 | 91 | ||
| 92 | if (WelsTargetMbConstruction (pCtx)) { | 92 | if (WelsTargetMbConstruction (pCtx)) { |
| 93 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, | 93 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, |
| 94 | "WelsTargetSliceConstruction():::MB(%d, %d) construction error. pCurSlice_type:%d\n", | 94 | "WelsTargetSliceConstruction():::MB(%d, %d) construction error. pCurSlice_type:%d", |
| 95 | pCurLayer->iMbX, pCurLayer->iMbY, pCurSlice->eSliceType); | 95 | pCurLayer->iMbX, pCurLayer->iMbY, pCurSlice->eSliceType); |
| 96 | 96 | ||
| 97 | return -1; | 97 | return -1; |
| @@ -105,7 +105,7 @@ int32_t WelsTargetSliceConstruction (PWelsDecoderContext pCtx) { · 7 unmodified lines | |||
| 105 | 105 | ||
| 106 | if (pCtx->iTotalNumMbRec > iTotalMbTargetLayer) { | 106 | if (pCtx->iTotalNumMbRec > iTotalMbTargetLayer) { |
| 107 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, | 107 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, |
| 108 | "WelsTargetSliceConstruction():::pCtx->iTotalNumMbRec:%d, iTotalMbTargetLayer:%d\n", | 108 | "WelsTargetSliceConstruction():::pCtx->iTotalNumMbRec:%d, iTotalMbTargetLayer:%d", |
| 109 | pCtx->iTotalNumMbRec, iTotalMbTargetLayer); | 109 | pCtx->iTotalNumMbRec, iTotalMbTargetLayer); |
| 110 | 110 | ||
| 111 | return -1; | 111 | return -1; |
| @@ -287,7 +287,7 @@ int32_t WelsTargetMbConstruction (PWelsDecoderContext pCtx) { · 175 unmodified lines | |||
| 287 | WelsMbInterConstruction (pCtx, pCurLayer); | 287 | WelsMbInterConstruction (pCtx, pCurLayer); |
| 288 | } | 288 | } |
| 289 | } else { | 289 | } else { |
| 290 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "WelsTargetMbConstruction():::::Unknown MB type: %d\n", | 290 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "WelsTargetMbConstruction():::::Unknown MB type: %d", |
| 291 | pCurLayer->pMbType[pCurLayer->iMbXyIndex]); | 291 | pCurLayer->pMbType[pCurLayer->iMbXyIndex]); |
| 292 | return -1; | 292 | return -1; |
| 293 | } | 293 | } |
| @@ -419,7 +419,7 @@ int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNal · 125 unmodified lines | |||
| 419 | } | 419 | } |
| 420 | if (iUsedBits > pBs->iBits) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash. | 420 | if (iUsedBits > pBs->iBits) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash. |
| 421 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, | 421 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, |
| 422 | "WelsDecodeSlice()::::pBs incomplete, iUsedBits:%"PRId64" > pBs->iBits:%d, MUST stop decoding.\n", | 422 | "WelsDecodeSlice()::::pBs incomplete, iUsedBits:%"PRId64" > pBs->iBits:%d, MUST stop decoding.", |
| 423 | (int64_t) iUsedBits, pBs->iBits); | 423 | (int64_t) iUsedBits, pBs->iBits); |
| 424 | return -1; | 424 | return -1; |
| 425 | } | 425 | } |
| @@ -690,7 +690,7 @@ int32_t WelsDecodeMbCavlcISlice (PWelsDecoderContext pCtx, PNalUnit pNalCur) { · 264 unmodified lines | |||
| 690 | if (!iBaseModeFlag) { | 690 | if (!iBaseModeFlag) { |
| 691 | iRet = WelsActualDecodeMbCavlcISlice (pCtx); | 691 | iRet = WelsActualDecodeMbCavlcISlice (pCtx); |
| 692 | } else { | 692 | } else { |
| 693 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.\n", | 693 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.", |
| 694 | iBaseModeFlag); | 694 | iBaseModeFlag); |
| 695 | return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP); | 695 | return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP); |
| 696 | } | 696 | } |
| @@ -747,7 +747,7 @@ int32_t WelsActualDecodeMbCavlcPSlice (PWelsDecoderContext pCtx) { · 50 unmodified lines | |||
| 747 | if (pCurLayer->pResidualPredFlag[iMbXy] == 0) { | 747 | if (pCurLayer->pResidualPredFlag[iMbXy] == 0) { |
| 748 | pCurLayer->pInterPredictionDoneFlag[iMbXy] = 0; | 748 | pCurLayer->pInterPredictionDoneFlag[iMbXy] = 0; |
| 749 | } else { | 749 | } else { |
| 750 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "residual_pred_flag = 1 not supported.\n"); | 750 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "residual_pred_flag = 1 not supported."); |
| 751 | return -1; | 751 | return -1; |
| 752 | } | 752 | } |
| 753 | } else { //intra MB type | 753 | } else { //intra MB type |
| @@ -1044,7 +1044,7 @@ int32_t WelsDecodeMbCavlcPSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur) { · 290 unmodified lines | |||
| 1044 | if (!iBaseModeFlag) { | 1044 | if (!iBaseModeFlag) { |
| 1045 | iRet = WelsActualDecodeMbCavlcPSlice (pCtx); | 1045 | iRet = WelsActualDecodeMbCavlcPSlice (pCtx); |
| 1046 | } else { | 1046 | } else { |
| 1047 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.\n", | 1047 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.", |
| 1048 | iBaseModeFlag); | 1048 | iBaseModeFlag); |
| 1049 | return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP); | 1049 | return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP); |
| 1050 | } | 1050 | } |