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/mc.cpp (1 of 16 files). Show all
Unified · Split
| @@ -420,7 +420,7 @@ static inline void_t McHorVer22_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 419 unmodified lines | ||
| 420 | 420 | |
| 421 | 421 | static inline void_t McHorVer01_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 422 | 422 | int32_t iWidth, int32_t iHeight) { |
| 423 | − FORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); | |
| 423 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); | |
| 424 | 424 | if (iWidth == 16) { |
| 425 | 425 | McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight); |
| 426 | 426 | PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight); |
| @@ -434,7 +434,7 @@ static inline void_t McHorVer01_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines | ||
| 434 | 434 | } |
| 435 | 435 | static inline void_t McHorVer03_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 436 | 436 | int32_t iWidth, int32_t iHeight) { |
| 437 | − FORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); | |
| 437 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); | |
| 438 | 438 | if (iWidth == 16) { |
| 439 | 439 | McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight); |
| 440 | 440 | PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight); |
| @@ -448,7 +448,7 @@ static inline void_t McHorVer03_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines | ||
| 448 | 448 | } |
| 449 | 449 | static inline void_t McHorVer10_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 450 | 450 | int32_t iWidth, int32_t iHeight) { |
| 451 | − FORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); | |
| 451 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); | |
| 452 | 452 | if (iWidth == 16) { |
| 453 | 453 | McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight); |
| 454 | 454 | PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight); |
| @@ -462,8 +462,8 @@ static inline void_t McHorVer10_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines | ||
| 462 | 462 | } |
| 463 | 463 | static inline void_t McHorVer11_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 464 | 464 | int32_t iWidth, int32_t iHeight) { |
| 465 | − FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 466 | − FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 465 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 466 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 467 | 467 | if (iWidth == 16) { |
| 468 | 468 | McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight); |
| 469 | 469 | McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight); |
| @@ -480,8 +480,8 @@ static inline void_t McHorVer11_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines | ||
| 480 | 480 | } |
| 481 | 481 | static inline void_t McHorVer12_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 482 | 482 | int32_t iWidth, int32_t iHeight) { |
| 483 | − FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 484 | − FORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | |
| 483 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 484 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | |
| 485 | 485 | if (iWidth == 16) { |
| 486 | 486 | McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight); |
| 487 | 487 | McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight); |
| @@ -498,8 +498,8 @@ static inline void_t McHorVer12_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines | ||
| 498 | 498 | } |
| 499 | 499 | static inline void_t McHorVer13_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 500 | 500 | int32_t iWidth, int32_t iHeight) { |
| 501 | − FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 502 | − FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 501 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 502 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 503 | 503 | if (iWidth == 16) { |
| 504 | 504 | McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight); |
| 505 | 505 | McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight); |
| @@ -516,8 +516,8 @@ static inline void_t McHorVer13_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines | ||
| 516 | 516 | } |
| 517 | 517 | static inline void_t McHorVer21_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 518 | 518 | int32_t iWidth, int32_t iHeight) { |
| 519 | − FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 520 | − FORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | |
| 519 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 520 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | |
| 521 | 521 | if (iWidth == 16) { |
| 522 | 522 | McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight); |
| 523 | 523 | McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight); |
| @@ -534,8 +534,8 @@ static inline void_t McHorVer21_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines | ||
| 534 | 534 | } |
| 535 | 535 | static inline void_t McHorVer23_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 536 | 536 | int32_t iWidth, int32_t iHeight) { |
| 537 | − FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 538 | − FORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | |
| 537 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 538 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | |
| 539 | 539 | if (iWidth == 16) { |
| 540 | 540 | McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight); |
| 541 | 541 | McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight); |
| @@ -552,7 +552,7 @@ static inline void_t McHorVer23_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines | ||
| 552 | 552 | } |
| 553 | 553 | static inline void_t McHorVer30_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 554 | 554 | int32_t iWidth, int32_t iHeight) { |
| 555 | − FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 555 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 556 | 556 | if (iWidth == 16) { |
| 557 | 557 | McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight); |
| 558 | 558 | PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight); |
| @@ -566,8 +566,8 @@ static inline void_t McHorVer30_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines | ||
| 566 | 566 | } |
| 567 | 567 | static inline void_t McHorVer31_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 568 | 568 | int32_t iWidth, int32_t iHeight) { |
| 569 | − FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 570 | − FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 569 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 570 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 571 | 571 | if (iWidth == 16) { |
| 572 | 572 | McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight); |
| 573 | 573 | McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight); |
| @@ -584,8 +584,8 @@ static inline void_t McHorVer31_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines | ||
| 584 | 584 | } |
| 585 | 585 | static inline void_t McHorVer32_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 586 | 586 | int32_t iWidth, int32_t iHeight) { |
| 587 | − FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 588 | − FORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | |
| 587 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 588 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | |
| 589 | 589 | if (iWidth == 16) { |
| 590 | 590 | McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight); |
| 591 | 591 | McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight); |
| @@ -602,8 +602,8 @@ static inline void_t McHorVer32_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines | ||
| 602 | 602 | } |
| 603 | 603 | static inline void_t McHorVer33_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 604 | 604 | int32_t iWidth, int32_t iHeight) { |
| 605 | − FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 606 | − FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 605 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | |
| 606 | + ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | |
| 607 | 607 | if (iWidth == 16) { |
| 608 | 608 | McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight); |
| 609 | 609 | McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight); |
| @@ -666,4 +666,4 @@ void_t InitMcFunc (SMcFunc* pMcFunc, int32_t iCpu) { · 56 unmodified lines | ||
| 666 | 666 | #endif //(X86_ASM) |
| 667 | 667 | } |
| 668 | 668 | |
| 669 | −} // namespace WelsDec | |
| 669 | +} // namespace WelsDec | |