All of these macros are already available in the common macros.h header. Unify all the macros to be named ENFORCE_* instead of mixed FORCE/ENFORCE.
Showing the changes to codec/decoder/core/src/decode_slice.cpp (1 of 16 files). Show all
Unified · Split
| @@ -492,7 +492,7 @@ int32_t WelsActualDecodeMbCavlcISlice (PWelsDecoderContext pCtx) { · 491 unmodified lines | ||
| 492 | 492 | int32_t iNMbMode, i; |
| 493 | 493 | uint32_t uiMbType = 0, uiCbp = 0, uiCbpL = 0, uiCbpC = 0; |
| 494 | 494 | |
| 495 | − FORCE_STACK_ALIGN_1D (uint8_t, pNonZeroCount, 48, 16); | |
| 495 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pNonZeroCount, 48, 16); | |
| 496 | 496 | |
| 497 | 497 | pCurLayer->pInterPredictionDoneFlag[iMbXy] = 0; |
| 498 | 498 | pCurLayer->pResidualPredFlag[iMbXy] = pSlice->sSliceHeaderExt.bDefaultResidualPredFlag; |
| @@ -553,7 +553,7 @@ int32_t WelsActualDecodeMbCavlcISlice (PWelsDecoderContext pCtx) { · 54 unmodified lines | ||
| 553 | 553 | memset (pCurLayer->pNzc[iMbXy], 16, sizeof (pCurLayer->pNzc[iMbXy])); //JVT-x201wcm1.doc, page229, 2009.10.23 |
| 554 | 554 | return 0; |
| 555 | 555 | } else if (0 == uiMbType) { //reference to JM |
| 556 | − FORCE_STACK_ALIGN_1D (int8_t, pIntraPredMode, 48, 16); | |
| 556 | + ENFORCE_STACK_ALIGN_1D (int8_t, pIntraPredMode, 48, 16); | |
| 557 | 557 | pCurLayer->pMbType[iMbXy] = MB_TYPE_INTRA4x4; |
| 558 | 558 | pCtx->pFillInfoCacheIntra4x4Func (&sNeighAvail, pNonZeroCount, pIntraPredMode, pCurLayer); |
| 559 | 559 | if (pCtx->pParseIntra4x4ModeFunc (&sNeighAvail, pIntraPredMode, pBs, pCurLayer)) { |
| @@ -770,7 +770,7 @@ int32_t WelsActualDecodeMbCavlcPSlice (PWelsDecoderContext pCtx) { · 210 unmodified lines | ||
| 770 | 770 | int32_t iNMbMode, i; |
| 771 | 771 | uint32_t uiMbType = 0, uiCbp = 0, uiCbpL = 0, uiCbpC = 0; |
| 772 | 772 | |
| 773 | − FORCE_STACK_ALIGN_1D (uint8_t, pNonZeroCount, 48, 16); | |
| 773 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pNonZeroCount, 48, 16); | |
| 774 | 774 | pCurLayer->pInterPredictionDoneFlag[iMbXy] = 0;//2009.10.23 |
| 775 | 775 | |
| 776 | 776 | uiMbType = BsGetUe (pBs); |
| @@ -859,7 +859,7 @@ int32_t WelsActualDecodeMbCavlcPSlice (PWelsDecoderContext pCtx) { · 82 unmodified lines | ||
| 859 | 859 | return 0; |
| 860 | 860 | } else { |
| 861 | 861 | if (0 == uiMbType) { |
| 862 | − FORCE_STACK_ALIGN_1D (int8_t, pIntraPredMode, 48, 16); | |
| 862 | + ENFORCE_STACK_ALIGN_1D (int8_t, pIntraPredMode, 48, 16); | |
| 863 | 863 | pCurLayer->pMbType[iMbXy] = MB_TYPE_INTRA4x4; |
| 864 | 864 | pCtx->pFillInfoCacheIntra4x4Func (&sNeighAvail, pNonZeroCount, pIntraPredMode, pCurLayer); |
| 865 | 865 | if (pCtx->pParseIntra4x4ModeFunc (&sNeighAvail, pIntraPredMode, pBs, pCurLayer)) { |