Also get rid of other stray tabs in scripts.
Showing the changes to codec/common/src/mc.cpp (1 of 7 files). Show all
Unified · Split
| @@ -401,36 +401,36 @@ static inline void McHorVer22WidthEq16_sse2 (const uint8_t* pSrc, int32_t iSrcSt · 400 unmodified lines | ||
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | void McHorVer20Width5Or9Or17_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 404 | − int32_t iWidth, int32_t iHeight) { | |
| 405 | − if (iWidth == 17 || iWidth == 9) | |
| 406 | − McHorVer20Width9Or17_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); | |
| 407 | − else //if (iWidth == 5) | |
| 408 | − McHorVer20Width5_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); | |
| 404 | + int32_t iWidth, int32_t iHeight) { | |
| 405 | + if (iWidth == 17 || iWidth == 9) | |
| 406 | + McHorVer20Width9Or17_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); | |
| 407 | + else //if (iWidth == 5) | |
| 408 | + McHorVer20Width5_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); | |
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | void McHorVer02Height5Or9Or17_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 412 | − int32_t iWidth, int32_t iHeight) { | |
| 413 | − if (iWidth == 16 || iWidth == 8) | |
| 414 | − McHorVer02Height9Or17_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); | |
| 415 | − else //if (iWidth == 4) | |
| 416 | − McHorVer02Height5_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); | |
| 412 | + int32_t iWidth, int32_t iHeight) { | |
| 413 | + if (iWidth == 16 || iWidth == 8) | |
| 414 | + McHorVer02Height9Or17_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); | |
| 415 | + else //if (iWidth == 4) | |
| 416 | + McHorVer02Height5_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); | |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | 419 | void McHorVer22Width5Or9Or17Height5Or9Or17_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 420 | − int32_t iWidth, int32_t iHeight) { | |
| 421 | − ENFORCE_STACK_ALIGN_2D (int16_t, pTap, 22, 24, 16) | |
| 422 | − if (iWidth == 17 || iWidth == 9){ | |
| 423 | − int32_t tmp1 = 2 * (iWidth - 8); | |
| 424 | − McHorVer22HorFirst_sse2 (pSrc - 2, iSrcStride, (uint8_t*)pTap, 48, iWidth, iHeight + 5); | |
| 425 | − McHorVer22Width8VerLastAlign_sse2 ((uint8_t*)pTap, 48, pDst, iDstStride, iWidth - 1, iHeight); | |
| 426 | − McHorVer22Width8VerLastUnAlign_sse2 ((uint8_t*)pTap + tmp1, 48, pDst + iWidth - 8, iDstStride, 8, iHeight); | |
| 427 | − } | |
| 428 | − else{ //if(iWidth == 5) | |
| 429 | − int32_t tmp1 = 2 * (iWidth - 4); | |
| 430 | − McHorVer22Width5HorFirst_sse2 (pSrc - 2, iSrcStride, (uint8_t*)pTap, 48, iWidth, iHeight + 5); | |
| 431 | − McHorVer22Width4VerLastAlign_sse2 ((uint8_t*)pTap, 48, pDst, iDstStride, iWidth - 1, iHeight); | |
| 432 | − McHorVer22Width4VerLastUnAlign_sse2 ((uint8_t*)pTap + tmp1, 48, pDst + iWidth - 4, iDstStride, 4, iHeight); | |
| 433 | − } | |
| 420 | + int32_t iWidth, int32_t iHeight) { | |
| 421 | + ENFORCE_STACK_ALIGN_2D (int16_t, pTap, 22, 24, 16) | |
| 422 | + if (iWidth == 17 || iWidth == 9){ | |
| 423 | + int32_t tmp1 = 2 * (iWidth - 8); | |
| 424 | + McHorVer22HorFirst_sse2 (pSrc - 2, iSrcStride, (uint8_t*)pTap, 48, iWidth, iHeight + 5); | |
| 425 | + McHorVer22Width8VerLastAlign_sse2 ((uint8_t*)pTap, 48, pDst, iDstStride, iWidth - 1, iHeight); | |
| 426 | + McHorVer22Width8VerLastUnAlign_sse2 ((uint8_t*)pTap + tmp1, 48, pDst + iWidth - 8, iDstStride, 8, iHeight); | |
| 427 | + } | |
| 428 | + else{ //if(iWidth == 5) | |
| 429 | + int32_t tmp1 = 2 * (iWidth - 4); | |
| 430 | + McHorVer22Width5HorFirst_sse2 (pSrc - 2, iSrcStride, (uint8_t*)pTap, 48, iWidth, iHeight + 5); | |
| 431 | + McHorVer22Width4VerLastAlign_sse2 ((uint8_t*)pTap, 48, pDst, iDstStride, iWidth - 1, iHeight); | |
| 432 | + McHorVer22Width4VerLastUnAlign_sse2 ((uint8_t*)pTap + tmp1, 48, pDst + iWidth - 4, iDstStride, 4, iHeight); | |
| 433 | + } | |
| 434 | 434 | |
| 435 | 435 | } |
| 436 | 436 | |