Showing the changes to codec/encoder/core/src/deblocking.cpp (1 of 85 files). Show all
Unified · Split
| @@ -575,22 +575,22 @@ void DeblockingBSCalc_neon (SWelsFuncPtrList* pFunc, SMB* pCurMb, uint8_t uiBS[2 · 574 unmodified lines | ||
| 575 | 575 | |
| 576 | 576 | #if defined(HAVE_NEON_AARCH64) && defined(SINGLE_REF_FRAME) |
| 577 | 577 | void DeblockingBSCalc_AArch64_neon (SWelsFuncPtrList* pFunc, SMB* pCurMb, uint8_t uiBS[2][4][4], Mb_Type uiCurMbType, |
| 578 | − int32_t iMbStride, int32_t iLeftFlag, int32_t iTopFlag) { | |
| 579 | − DeblockingBSCalcEnc_AArch64_neon (pCurMb->pNonZeroCount, pCurMb->sMv, pCurMb->uiNeighborAvail, iMbStride, uiBS); | |
| 580 | − if (iLeftFlag) { | |
| 581 | − if (IS_INTRA ((pCurMb - 1)->uiMbType)) { | |
| 582 | − * (uint32_t*)uiBS[0][0] = 0x04040404; | |
| 583 | − } | |
| 584 | − } else { | |
| 585 | − * (uint32_t*)uiBS[0][0] = 0; | |
| 578 | + int32_t iMbStride, int32_t iLeftFlag, int32_t iTopFlag) { | |
| 579 | + DeblockingBSCalcEnc_AArch64_neon (pCurMb->pNonZeroCount, pCurMb->sMv, pCurMb->uiNeighborAvail, iMbStride, uiBS); | |
| 580 | + if (iLeftFlag) { | |
| 581 | + if (IS_INTRA ((pCurMb - 1)->uiMbType)) { | |
| 582 | + * (uint32_t*)uiBS[0][0] = 0x04040404; | |
| 586 | 583 | } |
| 587 | − if (iTopFlag) { | |
| 588 | − if (IS_INTRA ((pCurMb - iMbStride)->uiMbType)) { | |
| 589 | − * (uint32_t*)uiBS[1][0] = 0x04040404; | |
| 590 | − } | |
| 591 | − } else { | |
| 592 | − * (uint32_t*)uiBS[1][0] = 0; | |
| 584 | + } else { | |
| 585 | + * (uint32_t*)uiBS[0][0] = 0; | |
| 586 | + } | |
| 587 | + if (iTopFlag) { | |
| 588 | + if (IS_INTRA ((pCurMb - iMbStride)->uiMbType)) { | |
| 589 | + * (uint32_t*)uiBS[1][0] = 0x04040404; | |
| 593 | 590 | } |
| 591 | + } else { | |
| 592 | + * (uint32_t*)uiBS[1][0] = 0; | |
| 593 | + } | |
| 594 | 594 | } |
| 595 | 595 | #endif |
| 596 | 596 | |
| @@ -787,9 +787,9 @@ void WelsBlockFuncInit (PSetNoneZeroCountZeroFunc* pfSetNZCZero, int32_t iCpu) · 190 unmodified lines | ||
| 787 | 787 | } |
| 788 | 788 | #endif |
| 789 | 789 | #ifdef HAVE_NEON_AARCH64 |
| 790 | − if (iCpu & WELS_CPU_NEON) { | |
| 791 | − *pfSetNZCZero = WelsNonZeroCount_AArch64_neon; | |
| 792 | − } | |
| 790 | + if (iCpu & WELS_CPU_NEON) { | |
| 791 | + *pfSetNZCZero = WelsNonZeroCount_AArch64_neon; | |
| 792 | + } | |
| 793 | 793 | #endif |
| 794 | 794 | } |
| 795 | 795 | |
| @@ -839,21 +839,21 @@ void DeblockingInit (DeblockingFunc* pFunc, int32_t iCpu) { · 43 unmodified lines | ||
| 839 | 839 | #endif |
| 840 | 840 | |
| 841 | 841 | #if defined(HAVE_NEON_AARCH64) |
| 842 | − if (iCpu & WELS_CPU_NEON) { | |
| 843 | − pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_AArch64_neon; | |
| 844 | − pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_AArch64_neon; | |
| 845 | − pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_AArch64_neon; | |
| 846 | − pFunc->pfLumaDeblockingEQ4Hor = DeblockLumaEq4H_AArch64_neon; | |
| 842 | + if (iCpu & WELS_CPU_NEON) { | |
| 843 | + pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_AArch64_neon; | |
| 844 | + pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_AArch64_neon; | |
| 845 | + pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_AArch64_neon; | |
| 846 | + pFunc->pfLumaDeblockingEQ4Hor = DeblockLumaEq4H_AArch64_neon; | |
| 847 | 847 | |
| 848 | − pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_AArch64_neon; | |
| 849 | − pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_AArch64_neon; | |
| 850 | − pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_AArch64_neon; | |
| 851 | − pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_AArch64_neon; | |
| 848 | + pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_AArch64_neon; | |
| 849 | + pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_AArch64_neon; | |
| 850 | + pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_AArch64_neon; | |
| 851 | + pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_AArch64_neon; | |
| 852 | 852 | |
| 853 | 853 | #if defined(SINGLE_REF_FRAME) |
| 854 | − pFunc->pfDeblockingBSCalc = DeblockingBSCalc_AArch64_neon; | |
| 854 | + pFunc->pfDeblockingBSCalc = DeblockingBSCalc_AArch64_neon; | |
| 855 | 855 | #endif |
| 856 | − } | |
| 856 | + } | |
| 857 | 857 | #endif |
| 858 | 858 | } |
| 859 | 859 | |