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/deblocking.cpp (1 of 16 files). Show all
Unified · Split
| @@ -145,7 +145,7 @@ static const uint8_t g_kuiTableBIdx[2][8] = { · 144 unmodified lines | |||
| 145 | 145 | ||
| 146 | void_t inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4], int32_t iLShiftFactor) { | 146 | void_t inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4], int32_t iLShiftFactor) { |
| 147 | uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3; | 147 | uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3; |
| 148 | FORCE_STACK_ALIGN_1D (uint8_t, uiBsx3, 4, 4); | 148 | ENFORCE_STACK_ALIGN_1D (uint8_t, uiBsx3, 4, 4); |
| 149 | 149 | ||
| 150 | uiNnz32b0 = * (uint32_t*) (pNnzTab + 0); | 150 | uiNnz32b0 = * (uint32_t*) (pNnzTab + 0); |
| 151 | uiNnz32b1 = * (uint32_t*) (pNnzTab + 4); | 151 | uiNnz32b1 = * (uint32_t*) (pNnzTab + 4); |
| @@ -181,7 +181,7 @@ void_t static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t n · 29 unmodified lines | |||
| 181 | int32_t iMbXy) { | 181 | int32_t iMbXy) { |
| 182 | uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3; | 182 | uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3; |
| 183 | int8_t* iRefIndex = pCurDqLayer->pRefIndex[LIST_0][iMbXy]; | 183 | int8_t* iRefIndex = pCurDqLayer->pRefIndex[LIST_0][iMbXy]; |
| 184 | FORCE_STACK_ALIGN_1D (uint8_t, uiBsx4, 4, 4); | 184 | ENFORCE_STACK_ALIGN_1D (uint8_t, uiBsx4, 4, 4); |
| 185 | 185 | ||
| 186 | uiNnz32b0 = * (uint32_t*) (pNnzTab + 0); | 186 | uiNnz32b0 = * (uint32_t*) (pNnzTab + 0); |
| 187 | uiNnz32b1 = * (uint32_t*) (pNnzTab + 4); | 187 | uiNnz32b1 = * (uint32_t*) (pNnzTab + 4); |
| @@ -269,7 +269,7 @@ void_t FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iS · 81 unmodified lines | |||
| 269 | int32_t iIndexA; | 269 | int32_t iIndexA; |
| 270 | int32_t iAlpha; | 270 | int32_t iAlpha; |
| 271 | int32_t iBeta; | 271 | int32_t iBeta; |
| 272 | FORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16); | 272 | ENFORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16); |
| 273 | 273 | ||
| 274 | GET_ALPHA_BETA_FROM_QP (pFilter->iLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha, | 274 | GET_ALPHA_BETA_FROM_QP (pFilter->iLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha, |
| 275 | iBeta); | 275 | iBeta); |
| @@ -286,7 +286,7 @@ void_t FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iS · 10 unmodified lines | |||
| 286 | int32_t iIndexA; | 286 | int32_t iIndexA; |
| 287 | int32_t iAlpha; | 287 | int32_t iAlpha; |
| 288 | int32_t iBeta; | 288 | int32_t iBeta; |
| 289 | FORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16); | 289 | ENFORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16); |
| 290 | 290 | ||
| 291 | GET_ALPHA_BETA_FROM_QP (pFilter->iLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha, | 291 | GET_ALPHA_BETA_FROM_QP (pFilter->iLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha, |
| 292 | iBeta); | 292 | iBeta); |
| @@ -331,7 +331,7 @@ void_t FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_ · 38 unmodified lines | |||
| 331 | int32_t iIndexA; | 331 | int32_t iIndexA; |
| 332 | int32_t iAlpha; | 332 | int32_t iAlpha; |
| 333 | int32_t iBeta; | 333 | int32_t iBeta; |
| 334 | FORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16); | 334 | ENFORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16); |
| 335 | 335 | ||
| 336 | GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha, | 336 | GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha, |
| 337 | iBeta); | 337 | iBeta); |
| @@ -347,7 +347,7 @@ void_t FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_ · 9 unmodified lines | |||
| 347 | int32_t iIndexA; | 347 | int32_t iIndexA; |
| 348 | int32_t iAlpha; | 348 | int32_t iAlpha; |
| 349 | int32_t iBeta; | 349 | int32_t iBeta; |
| 350 | FORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16); | 350 | ENFORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16); |
| 351 | 351 | ||
| 352 | GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha, | 352 | GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha, |
| 353 | iBeta); | 353 | iBeta); |
| @@ -483,8 +483,8 @@ void_t FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, in · 129 unmodified lines | |||
| 483 | int32_t iCurQp; | 483 | int32_t iCurQp; |
| 484 | int32_t iIndexA, iAlpha, iBeta; | 484 | int32_t iIndexA, iAlpha, iBeta; |
| 485 | 485 | ||
| 486 | FORCE_STACK_ALIGN_1D (int8_t, iTc, 4, 16); | 486 | ENFORCE_STACK_ALIGN_1D (int8_t, iTc, 4, 16); |
| 487 | FORCE_STACK_ALIGN_1D (uint8_t, uiBSx4, 4, 4); | 487 | ENFORCE_STACK_ALIGN_1D (uint8_t, uiBSx4, 4, 4); |
| 488 | 488 | ||
| 489 | pDestY = pFilter->pCsData[0] + ((iMbY * iLineSize + iMbX) << 4); | 489 | pDestY = pFilter->pCsData[0] + ((iMbY * iLineSize + iMbX) << 4); |
| 490 | iCurQp = pCurDqLayer->pLumaQp[iMbXyIndex]; | 490 | iCurQp = pCurDqLayer->pLumaQp[iMbXyIndex]; |
| @@ -531,8 +531,8 @@ void_t FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, · 40 unmodified lines | |||
| 531 | int32_t iCurQp; | 531 | int32_t iCurQp; |
| 532 | int32_t iIndexA, iAlpha, iBeta; | 532 | int32_t iIndexA, iAlpha, iBeta; |
| 533 | 533 | ||
| 534 | FORCE_STACK_ALIGN_1D (int8_t, iTc, 4, 16); | 534 | ENFORCE_STACK_ALIGN_1D (int8_t, iTc, 4, 16); |
| 535 | FORCE_STACK_ALIGN_1D (uint8_t, uiBSx4, 4, 4); | 535 | ENFORCE_STACK_ALIGN_1D (uint8_t, uiBSx4, 4, 4); |
| 536 | 536 | ||
| 537 | pDestCb = pFilter->pCsData[1] + ((iMbY * iLineSize + iMbX) << 3); | 537 | pDestCb = pFilter->pCsData[1] + ((iMbY * iLineSize + iMbX) << 3); |
| 538 | pDestCr = pFilter->pCsData[2] + ((iMbY * iLineSize + iMbX) << 3); | 538 | pDestCr = pFilter->pCsData[2] + ((iMbY * iLineSize + iMbX) << 3); |