Showing the changes to codec/common/src/mc.cpp (1 of 3 files). Show all
Unified · Split
| @@ -716,26 +716,32 @@ void PixelAvg_sse2 (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int · 715 unmodified lines | ||
| 716 | 716 | // NEON implementation // |
| 717 | 717 | //***************************************************************************// |
| 718 | 718 | #if defined(HAVE_NEON) |
| 719 | −void McHorVer20Width9Or17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | |
| 719 | +void McHorVer20Width5Or9Or17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | |
| 720 | 720 | int32_t iWidth, int32_t iHeight) { |
| 721 | 721 | if (iWidth == 17) |
| 722 | 722 | McHorVer20Width17_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 723 | − else //if (iWidth == 9) | |
| 723 | + else if (iWidth == 9) | |
| 724 | 724 | McHorVer20Width9_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 725 | + else //if (iWidth == 5) | |
| 726 | + McHorVer20Width5_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight); | |
| 725 | 727 | } |
| 726 | −void McHorVer02Height9Or17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | |
| 728 | +void McHorVer02Height5Or9Or17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | |
| 727 | 729 | int32_t iWidth, int32_t iHeight) { |
| 728 | 730 | if (iWidth == 16) |
| 729 | 731 | McHorVer02Height17_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 730 | − else //if (iWidth == 8) | |
| 732 | + else if (iWidth == 8) | |
| 731 | 733 | McHorVer02Height9_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 734 | + else //if (iWidth == 4) | |
| 735 | + McHorVer02Height5_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight); | |
| 732 | 736 | } |
| 733 | −void McHorVer22Width9Or17Height9Or17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | |
| 737 | +void McHorVer22Width5Or9Or17Height5Or9Or17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | |
| 734 | 738 | int32_t iWidth, int32_t iHeight) { |
| 735 | 739 | if (iWidth == 17) |
| 736 | 740 | McHorVer22Width17_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 737 | − else //if (iWidth == 9) | |
| 741 | + else if (iWidth == 9) | |
| 738 | 742 | McHorVer22Width9_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 743 | + else //if (iWidth == 5) | |
| 744 | + McHorVer22Width5_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight); | |
| 739 | 745 | } |
| 740 | 746 | void McCopy_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 741 | 747 | int32_t iWidth, int32_t iHeight) { |
| @@ -1311,9 +1317,9 @@ void InitMcFunc (SMcFunc* pMcFuncs, uint32_t uiCpuFlag) { · 569 unmodified lines | ||
| 1311 | 1317 | pMcFuncs->pMcLumaFunc = McLuma_neon; |
| 1312 | 1318 | pMcFuncs->pMcChromaFunc = McChroma_neon; |
| 1313 | 1319 | pMcFuncs->pfSampleAveraging = PixelAvg_neon; |
| 1314 | − pMcFuncs->pfLumaHalfpelHor = McHorVer20Width9Or17_neon;//iWidth+1:8/16 | |
| 1315 | − pMcFuncs->pfLumaHalfpelVer = McHorVer02Height9Or17_neon;//heigh+1:8/16 | |
| 1316 | − pMcFuncs->pfLumaHalfpelCen = McHorVer22Width9Or17Height9Or17_neon;//iWidth+1/heigh+1 | |
| 1320 | + pMcFuncs->pfLumaHalfpelHor = McHorVer20Width5Or9Or17_neon;//iWidth+1:4/8/16 | |
| 1321 | + pMcFuncs->pfLumaHalfpelVer = McHorVer02Height5Or9Or17_neon;//heigh+1:4/8/16 | |
| 1322 | + pMcFuncs->pfLumaHalfpelCen = McHorVer22Width5Or9Or17Height5Or9Or17_neon;//iWidth+1/heigh+1 | |
| 1317 | 1323 | } |
| 1318 | 1324 | #endif |
| 1319 | 1325 | #if defined(HAVE_NEON_AARCH64) |