There's really no reason for adding a typedef for void.
Showing the changes to codec/decoder/core/src/mc.cpp (1 of 55 files). Show all
Unified · Split
| @@ -84,13 +84,13 @@ static const uint8_t g_kuiABCD[8][8][4] = { //g_kA[dy][dx], g_kB[dy][dx], g_kC[d · 83 unmodified lines | |||
| 84 | } | 84 | } |
| 85 | }; | 85 | }; |
| 86 | 86 | ||
| 87 | typedef void_t (*PWelsMcWidthHeightFunc) (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 87 | typedef void (*PWelsMcWidthHeightFunc) (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 88 | int32_t iWidth, int32_t iHeight); | 88 | int32_t iWidth, int32_t iHeight); |
| 89 | 89 | ||
| 90 | //***************************************************************************// | 90 | //***************************************************************************// |
| 91 | // C code implementation // | 91 | // C code implementation // |
| 92 | //***************************************************************************// | 92 | //***************************************************************************// |
| 93 | static inline void_t McCopyWidthEq2_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 93 | static inline void McCopyWidthEq2_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 94 | int32_t iHeight) { | 94 | int32_t iHeight) { |
| 95 | int32_t i; | 95 | int32_t i; |
| 96 | for (i = 0; i < iHeight; i++) { // iWidth == 2 only for chroma | 96 | for (i = 0; i < iHeight; i++) { // iWidth == 2 only for chroma |
| @@ -100,7 +100,7 @@ static inline void_t McCopyWidthEq2_c (uint8_t* pSrc, int32_t iSrcStride, uint8_ · 3 unmodified lines | |||
| 100 | } | 100 | } |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | static inline void_t McCopyWidthEq4_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 103 | static inline void McCopyWidthEq4_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 104 | int32_t iHeight) { | 104 | int32_t iHeight) { |
| 105 | int32_t i; | 105 | int32_t i; |
| 106 | for (i = 0; i < iHeight; i++) { | 106 | for (i = 0; i < iHeight; i++) { |
| @@ -110,7 +110,7 @@ static inline void_t McCopyWidthEq4_c (uint8_t* pSrc, int32_t iSrcStride, uint8_ · 3 unmodified lines | |||
| 110 | } | 110 | } |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | static inline void_t McCopyWidthEq8_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 113 | static inline void McCopyWidthEq8_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 114 | int32_t iHeight) { | 114 | int32_t iHeight) { |
| 115 | int32_t i; | 115 | int32_t i; |
| 116 | for (i = 0; i < iHeight; i++) { | 116 | for (i = 0; i < iHeight; i++) { |
| @@ -120,7 +120,7 @@ static inline void_t McCopyWidthEq8_c (uint8_t* pSrc, int32_t iSrcStride, uint8_ · 3 unmodified lines | |||
| 120 | } | 120 | } |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | static inline void_t McCopyWidthEq16_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 123 | static inline void McCopyWidthEq16_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 124 | int32_t iHeight) { | 124 | int32_t iHeight) { |
| 125 | int32_t i; | 125 | int32_t i; |
| 126 | for (i = 0; i < iHeight; i++) { | 126 | for (i = 0; i < iHeight; i++) { |
| @@ -152,7 +152,7 @@ static inline int32_t FilterInput8bitWithStride_c (uint8_t* pSrc, const int32_t · 25 unmodified lines | |||
| 152 | return (kuiPix05 - ((kuiPix14 << 2) + kuiPix14) + (kuiPix23 << 4) + (kuiPix23 << 2)); | 152 | return (kuiPix05 - ((kuiPix14 << 2) + kuiPix14) + (kuiPix23 << 4) + (kuiPix23 << 2)); |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | static inline void_t PixelAvg_c (uint8_t* pDst, int32_t iDstStride, uint8_t* pSrcA, int32_t iSrcAStride, | 155 | static inline void PixelAvg_c (uint8_t* pDst, int32_t iDstStride, uint8_t* pSrcA, int32_t iSrcAStride, |
| 156 | uint8_t* pSrcB, int32_t iSrcBStride, int32_t iWidth, int32_t iHeight) { | 156 | uint8_t* pSrcB, int32_t iSrcBStride, int32_t iWidth, int32_t iHeight) { |
| 157 | int32_t i, j; | 157 | int32_t i, j; |
| 158 | for (i = 0; i < iHeight; i++) { | 158 | for (i = 0; i < iHeight; i++) { |
| @@ -164,7 +164,7 @@ static inline void_t PixelAvg_c (uint8_t* pDst, int32_t iDstStride, uint8_t* pSr · 5 unmodified lines | |||
| 164 | pSrcB += iSrcBStride; | 164 | pSrcB += iSrcBStride; |
| 165 | } | 165 | } |
| 166 | } | 166 | } |
| 167 | static inline void_t McCopy_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 167 | static inline void McCopy_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 168 | int32_t iHeight) { | 168 | int32_t iHeight) { |
| 169 | if (iWidth == 16) | 169 | if (iWidth == 16) |
| 170 | McCopyWidthEq16_c (pSrc, iSrcStride, pDst, iDstStride, iHeight); | 170 | McCopyWidthEq16_c (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| @@ -176,7 +176,7 @@ static inline void_t McCopy_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, · 5 unmodified lines | |||
| 176 | McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight); | 176 | McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | static inline void_t McHorVer20_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 179 | static inline void McHorVer20_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 180 | int32_t iHeight) { | 180 | int32_t iHeight) { |
| 181 | int32_t i, j; | 181 | int32_t i, j; |
| 182 | for (i = 0; i < iHeight; i++) { | 182 | for (i = 0; i < iHeight; i++) { |
| @@ -188,7 +188,7 @@ static inline void_t McHorVer20_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 5 unmodified lines | |||
| 188 | } | 188 | } |
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | static inline void_t McHorVer02_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 191 | static inline void McHorVer02_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 192 | int32_t iHeight) { | 192 | int32_t iHeight) { |
| 193 | int32_t i, j; | 193 | int32_t i, j; |
| 194 | for (i = 0; i < iHeight; i++) { | 194 | for (i = 0; i < iHeight; i++) { |
| @@ -200,7 +200,7 @@ static inline void_t McHorVer02_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 5 unmodified lines | |||
| 200 | } | 200 | } |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | static inline void_t McHorVer22_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 203 | static inline void McHorVer22_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 204 | int32_t iHeight) { | 204 | int32_t iHeight) { |
| 205 | int16_t iTmp[16 + 5] = {0}; //16 | 205 | int16_t iTmp[16 + 5] = {0}; //16 |
| 206 | int32_t i, j, k; | 206 | int32_t i, j, k; |
| @@ -218,25 +218,25 @@ static inline void_t McHorVer22_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 11 unmodified lines | |||
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | /////////////////////luma MC////////////////////////// | 220 | /////////////////////luma MC////////////////////////// |
| 221 | static inline void_t McHorVer01_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 221 | static inline void McHorVer01_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 222 | int32_t iHeight) { | 222 | int32_t iHeight) { |
| 223 | uint8_t uiTmp[256] = { 0 }; | 223 | uint8_t uiTmp[256] = { 0 }; |
| 224 | McHorVer02_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight); | 224 | McHorVer02_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight); |
| 225 | PixelAvg_c (pDst, iDstStride, pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight); | 225 | PixelAvg_c (pDst, iDstStride, pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight); |
| 226 | } | 226 | } |
| 227 | static inline void_t McHorVer03_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 227 | static inline void McHorVer03_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 228 | int32_t iHeight) { | 228 | int32_t iHeight) { |
| 229 | uint8_t uiTmp[256] = { 0 }; | 229 | uint8_t uiTmp[256] = { 0 }; |
| 230 | McHorVer02_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight); | 230 | McHorVer02_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight); |
| 231 | PixelAvg_c (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, uiTmp, 16, iWidth, iHeight); | 231 | PixelAvg_c (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, uiTmp, 16, iWidth, iHeight); |
| 232 | } | 232 | } |
| 233 | static inline void_t McHorVer10_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 233 | static inline void McHorVer10_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 234 | int32_t iHeight) { | 234 | int32_t iHeight) { |
| 235 | uint8_t uiTmp[256] = { 0 }; | 235 | uint8_t uiTmp[256] = { 0 }; |
| 236 | McHorVer20_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight); | 236 | McHorVer20_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight); |
| 237 | PixelAvg_c (pDst, iDstStride, pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight); | 237 | PixelAvg_c (pDst, iDstStride, pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight); |
| 238 | } | 238 | } |
| 239 | static inline void_t McHorVer11_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 239 | static inline void McHorVer11_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 240 | int32_t iHeight) { | 240 | int32_t iHeight) { |
| 241 | uint8_t uiHorTmp[256] = { 0 }; | 241 | uint8_t uiHorTmp[256] = { 0 }; |
| 242 | uint8_t uiVerTmp[256] = { 0 }; | 242 | uint8_t uiVerTmp[256] = { 0 }; |
| @@ -244,7 +244,7 @@ static inline void_t McHorVer11_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 1 unmodified line | |||
| 244 | McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight); | 244 | McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight); |
| 245 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight); | 245 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight); |
| 246 | } | 246 | } |
| 247 | static inline void_t McHorVer12_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 247 | static inline void McHorVer12_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 248 | int32_t iHeight) { | 248 | int32_t iHeight) { |
| 249 | uint8_t uiVerTmp[256] = { 0 }; | 249 | uint8_t uiVerTmp[256] = { 0 }; |
| 250 | uint8_t uiCtrTmp[256] = { 0 }; | 250 | uint8_t uiCtrTmp[256] = { 0 }; |
| @@ -252,7 +252,7 @@ static inline void_t McHorVer12_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 1 unmodified line | |||
| 252 | McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight); | 252 | McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight); |
| 253 | PixelAvg_c (pDst, iDstStride, uiVerTmp, 16, uiCtrTmp, 16, iWidth, iHeight); | 253 | PixelAvg_c (pDst, iDstStride, uiVerTmp, 16, uiCtrTmp, 16, iWidth, iHeight); |
| 254 | } | 254 | } |
| 255 | static inline void_t McHorVer13_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 255 | static inline void McHorVer13_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 256 | int32_t iHeight) { | 256 | int32_t iHeight) { |
| 257 | uint8_t uiHorTmp[256] = { 0 }; | 257 | uint8_t uiHorTmp[256] = { 0 }; |
| 258 | uint8_t uiVerTmp[256] = { 0 }; | 258 | uint8_t uiVerTmp[256] = { 0 }; |
| @@ -260,7 +260,7 @@ static inline void_t McHorVer13_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 1 unmodified line | |||
| 260 | McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight); | 260 | McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight); |
| 261 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight); | 261 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight); |
| 262 | } | 262 | } |
| 263 | static inline void_t McHorVer21_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 263 | static inline void McHorVer21_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 264 | int32_t iHeight) { | 264 | int32_t iHeight) { |
| 265 | uint8_t uiHorTmp[256] = { 0 }; | 265 | uint8_t uiHorTmp[256] = { 0 }; |
| 266 | uint8_t uiCtrTmp[256] = { 0 }; | 266 | uint8_t uiCtrTmp[256] = { 0 }; |
| @@ -268,7 +268,7 @@ static inline void_t McHorVer21_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 1 unmodified line | |||
| 268 | McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight); | 268 | McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight); |
| 269 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiCtrTmp, 16, iWidth, iHeight); | 269 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiCtrTmp, 16, iWidth, iHeight); |
| 270 | } | 270 | } |
| 271 | static inline void_t McHorVer23_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 271 | static inline void McHorVer23_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 272 | int32_t iHeight) { | 272 | int32_t iHeight) { |
| 273 | uint8_t uiHorTmp[256] = { 0 }; | 273 | uint8_t uiHorTmp[256] = { 0 }; |
| 274 | uint8_t uiCtrTmp[256] = { 0 }; | 274 | uint8_t uiCtrTmp[256] = { 0 }; |
| @@ -276,13 +276,13 @@ static inline void_t McHorVer23_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 1 unmodified line | |||
| 276 | McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight); | 276 | McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight); |
| 277 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiCtrTmp, 16, iWidth, iHeight); | 277 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiCtrTmp, 16, iWidth, iHeight); |
| 278 | } | 278 | } |
| 279 | static inline void_t McHorVer30_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 279 | static inline void McHorVer30_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 280 | int32_t iHeight) { | 280 | int32_t iHeight) { |
| 281 | uint8_t uiHorTmp[256] = { 0 }; | 281 | uint8_t uiHorTmp[256] = { 0 }; |
| 282 | McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight); | 282 | McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight); |
| 283 | PixelAvg_c (pDst, iDstStride, pSrc + 1, iSrcStride, uiHorTmp, 16, iWidth, iHeight); | 283 | PixelAvg_c (pDst, iDstStride, pSrc + 1, iSrcStride, uiHorTmp, 16, iWidth, iHeight); |
| 284 | } | 284 | } |
| 285 | static inline void_t McHorVer31_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 285 | static inline void McHorVer31_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 286 | int32_t iHeight) { | 286 | int32_t iHeight) { |
| 287 | uint8_t uiHorTmp[256] = { 0 }; | 287 | uint8_t uiHorTmp[256] = { 0 }; |
| 288 | uint8_t uiVerTmp[256] = { 0 }; | 288 | uint8_t uiVerTmp[256] = { 0 }; |
| @@ -290,7 +290,7 @@ static inline void_t McHorVer31_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 1 unmodified line | |||
| 290 | McHorVer02_c (pSrc + 1, iSrcStride, uiVerTmp, 16, iWidth, iHeight); | 290 | McHorVer02_c (pSrc + 1, iSrcStride, uiVerTmp, 16, iWidth, iHeight); |
| 291 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight); | 291 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight); |
| 292 | } | 292 | } |
| 293 | static inline void_t McHorVer32_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 293 | static inline void McHorVer32_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 294 | int32_t iHeight) { | 294 | int32_t iHeight) { |
| 295 | uint8_t uiVerTmp[256] = { 0 }; | 295 | uint8_t uiVerTmp[256] = { 0 }; |
| 296 | uint8_t uiCtrTmp[256] = { 0 }; | 296 | uint8_t uiCtrTmp[256] = { 0 }; |
| @@ -298,7 +298,7 @@ static inline void_t McHorVer32_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 1 unmodified line | |||
| 298 | McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight); | 298 | McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight); |
| 299 | PixelAvg_c (pDst, iDstStride, uiVerTmp, 16, uiCtrTmp, 16, iWidth, iHeight); | 299 | PixelAvg_c (pDst, iDstStride, uiVerTmp, 16, uiCtrTmp, 16, iWidth, iHeight); |
| 300 | } | 300 | } |
| 301 | static inline void_t McHorVer33_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 301 | static inline void McHorVer33_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 302 | int32_t iHeight) { | 302 | int32_t iHeight) { |
| 303 | uint8_t uiHorTmp[256] = { 0 }; | 303 | uint8_t uiHorTmp[256] = { 0 }; |
| 304 | uint8_t uiVerTmp[256] = { 0 }; | 304 | uint8_t uiVerTmp[256] = { 0 }; |
| @@ -307,7 +307,7 @@ static inline void_t McHorVer33_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* p · 2 unmodified lines | |||
| 307 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight); | 307 | PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight); |
| 308 | } | 308 | } |
| 309 | 309 | ||
| 310 | void_t McLuma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 310 | void McLuma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 311 | int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) | 311 | int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) |
| 312 | //pSrc has been added the offset of mv | 312 | //pSrc has been added the offset of mv |
| 313 | { | 313 | { |
| @@ -321,7 +321,7 @@ void_t McLuma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstS · 7 unmodified lines | |||
| 321 | pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); | 321 | pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); |
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | static inline void_t McChromaWithFragMv_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 324 | static inline void McChromaWithFragMv_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 325 | int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) { | 325 | int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) { |
| 326 | int32_t i, j; | 326 | int32_t i, j; |
| 327 | int32_t iA, iB, iC, iD; | 327 | int32_t iA, iB, iC, iD; |
| @@ -341,7 +341,7 @@ static inline void_t McChromaWithFragMv_c (uint8_t* pSrc, int32_t iSrcStride, ui · 13 unmodified lines | |||
| 341 | } | 341 | } |
| 342 | } | 342 | } |
| 343 | 343 | ||
| 344 | void_t McChroma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 344 | void McChroma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 345 | int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) | 345 | int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) |
| 346 | //pSrc has been added the offset of mv | 346 | //pSrc has been added the offset of mv |
| 347 | { | 347 | { |
| @@ -357,26 +357,26 @@ void_t McChroma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDs · 9 unmodified lines | |||
| 357 | //***************************************************************************// | 357 | //***************************************************************************// |
| 358 | // SSE2 implement // | 358 | // SSE2 implement // |
| 359 | //***************************************************************************// | 359 | //***************************************************************************// |
| 360 | static inline void_t McHorVer22WidthEq8_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 360 | static inline void McHorVer22WidthEq8_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 361 | int32_t iHeight) { | 361 | int32_t iHeight) { |
| 362 | ENFORCE_STACK_ALIGN_2D (int16_t, iTap, 21, 8, 16) | 362 | ENFORCE_STACK_ALIGN_2D (int16_t, iTap, 21, 8, 16) |
| 363 | McHorVer22Width8HorFirst_sse2 (pSrc - 2, iSrcStride, (uint8_t*)iTap, 16, iHeight + 5); | 363 | McHorVer22Width8HorFirst_sse2 (pSrc - 2, iSrcStride, (uint8_t*)iTap, 16, iHeight + 5); |
| 364 | McHorVer22Width8VerLastAlign_sse2 ((uint8_t*)iTap, 16, pDst, iDstStride, 8, iHeight); | 364 | McHorVer22Width8VerLastAlign_sse2 ((uint8_t*)iTap, 16, pDst, iDstStride, 8, iHeight); |
| 365 | } | 365 | } |
| 366 | 366 | ||
| 367 | static inline void_t McHorVer02WidthEq16_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 367 | static inline void McHorVer02WidthEq16_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 368 | int32_t iHeight) { | 368 | int32_t iHeight) { |
| 369 | McHorVer02WidthEq8_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); | 369 | McHorVer02WidthEq8_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 370 | McHorVer02WidthEq8_sse2 (&pSrc[8], iSrcStride, &pDst[8], iDstStride, iHeight); | 370 | McHorVer02WidthEq8_sse2 (&pSrc[8], iSrcStride, &pDst[8], iDstStride, iHeight); |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | static inline void_t McHorVer22WidthEq16_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 373 | static inline void McHorVer22WidthEq16_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 374 | int32_t iHeight) { | 374 | int32_t iHeight) { |
| 375 | McHorVer22WidthEq8_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); | 375 | McHorVer22WidthEq8_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 376 | McHorVer22WidthEq8_sse2 (&pSrc[8], iSrcStride, &pDst[8], iDstStride, iHeight); | 376 | McHorVer22WidthEq8_sse2 (&pSrc[8], iSrcStride, &pDst[8], iDstStride, iHeight); |
| 377 | } | 377 | } |
| 378 | 378 | ||
| 379 | static inline void_t McCopy_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, | 379 | static inline void McCopy_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth, |
| 380 | int32_t iHeight) { | 380 | int32_t iHeight) { |
| 381 | if (iWidth == 16) | 381 | if (iWidth == 16) |
| 382 | McCopyWidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); | 382 | McCopyWidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| @@ -388,7 +388,7 @@ static inline void_t McCopy_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pD · 5 unmodified lines | |||
| 388 | McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight); | 388 | McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 389 | } | 389 | } |
| 390 | 390 | ||
| 391 | static inline void_t McHorVer20_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 391 | static inline void McHorVer20_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 392 | int32_t iWidth, int32_t iHeight) { | 392 | int32_t iWidth, int32_t iHeight) { |
| 393 | if (iWidth == 16) | 393 | if (iWidth == 16) |
| 394 | McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); | 394 | McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| @@ -398,7 +398,7 @@ static inline void_t McHorVer20_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 3 unmodified lines | |||
| 398 | McHorVer20WidthEq4_mmx (pSrc, iSrcStride, pDst, iDstStride, iHeight); | 398 | McHorVer20WidthEq4_mmx (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| 399 | } | 399 | } |
| 400 | 400 | ||
| 401 | static inline void_t McHorVer02_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 401 | static inline void McHorVer02_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 402 | int32_t iWidth, int32_t iHeight) { | 402 | int32_t iWidth, int32_t iHeight) { |
| 403 | if (iWidth == 16) | 403 | if (iWidth == 16) |
| 404 | McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); | 404 | McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| @@ -408,7 +408,7 @@ static inline void_t McHorVer02_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 3 unmodified lines | |||
| 408 | McHorVer02_c (pSrc, iSrcStride, pDst, iDstStride, 4, iHeight); | 408 | McHorVer02_c (pSrc, iSrcStride, pDst, iDstStride, 4, iHeight); |
| 409 | } | 409 | } |
| 410 | 410 | ||
| 411 | static inline void_t McHorVer22_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 411 | static inline void McHorVer22_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 412 | int32_t iWidth, int32_t iHeight) { | 412 | int32_t iWidth, int32_t iHeight) { |
| 413 | if (iWidth == 16) | 413 | if (iWidth == 16) |
| 414 | McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); | 414 | McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight); |
| @@ -418,7 +418,7 @@ static inline void_t McHorVer22_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 3 unmodified lines | |||
| 418 | McHorVer22_c (pSrc, iSrcStride, pDst, iDstStride, 4, iHeight); | 418 | McHorVer22_c (pSrc, iSrcStride, pDst, iDstStride, 4, iHeight); |
| 419 | } | 419 | } |
| 420 | 420 | ||
| 421 | static inline void_t McHorVer01_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 421 | static inline void McHorVer01_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 422 | int32_t iWidth, int32_t iHeight) { | 422 | int32_t iWidth, int32_t iHeight) { |
| 423 | ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); | 423 | ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); |
| 424 | if (iWidth == 16) { | 424 | if (iWidth == 16) { |
| @@ -432,7 +432,7 @@ static inline void_t McHorVer01_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines | |||
| 432 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight); | 432 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight); |
| 433 | } | 433 | } |
| 434 | } | 434 | } |
| 435 | static inline void_t McHorVer03_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 435 | static inline void McHorVer03_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 436 | int32_t iWidth, int32_t iHeight) { | 436 | int32_t iWidth, int32_t iHeight) { |
| 437 | ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); | 437 | ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); |
| 438 | if (iWidth == 16) { | 438 | if (iWidth == 16) { |
| @@ -446,7 +446,7 @@ static inline void_t McHorVer03_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines | |||
| 446 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight); | 446 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight); |
| 447 | } | 447 | } |
| 448 | } | 448 | } |
| 449 | static inline void_t McHorVer10_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 449 | static inline void McHorVer10_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 450 | int32_t iWidth, int32_t iHeight) { | 450 | int32_t iWidth, int32_t iHeight) { |
| 451 | ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); | 451 | ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16); |
| 452 | if (iWidth == 16) { | 452 | if (iWidth == 16) { |
| @@ -460,7 +460,7 @@ static inline void_t McHorVer10_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines | |||
| 460 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight); | 460 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight); |
| 461 | } | 461 | } |
| 462 | } | 462 | } |
| 463 | static inline void_t McHorVer11_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 463 | static inline void McHorVer11_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 464 | int32_t iWidth, int32_t iHeight) { | 464 | int32_t iWidth, int32_t iHeight) { |
| 465 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | 465 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); |
| 466 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | 466 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); |
| @@ -478,7 +478,7 @@ static inline void_t McHorVer11_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 11 unmodified lines | |||
| 478 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight); | 478 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight); |
| 479 | } | 479 | } |
| 480 | } | 480 | } |
| 481 | static inline void_t McHorVer12_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 481 | static inline void McHorVer12_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 482 | int32_t iWidth, int32_t iHeight) { | 482 | int32_t iWidth, int32_t iHeight) { |
| 483 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | 483 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); |
| 484 | ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | 484 | ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); |
| @@ -496,7 +496,7 @@ static inline void_t McHorVer12_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 11 unmodified lines | |||
| 496 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight); | 496 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight); |
| 497 | } | 497 | } |
| 498 | } | 498 | } |
| 499 | static inline void_t McHorVer13_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 499 | static inline void McHorVer13_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 500 | int32_t iWidth, int32_t iHeight) { | 500 | int32_t iWidth, int32_t iHeight) { |
| 501 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | 501 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); |
| 502 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | 502 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); |
| @@ -514,7 +514,7 @@ static inline void_t McHorVer13_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 11 unmodified lines | |||
| 514 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight); | 514 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight); |
| 515 | } | 515 | } |
| 516 | } | 516 | } |
| 517 | static inline void_t McHorVer21_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 517 | static inline void McHorVer21_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 518 | int32_t iWidth, int32_t iHeight) { | 518 | int32_t iWidth, int32_t iHeight) { |
| 519 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | 519 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); |
| 520 | ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | 520 | ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); |
| @@ -532,7 +532,7 @@ static inline void_t McHorVer21_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 11 unmodified lines | |||
| 532 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight); | 532 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight); |
| 533 | } | 533 | } |
| 534 | } | 534 | } |
| 535 | static inline void_t McHorVer23_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 535 | static inline void McHorVer23_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 536 | int32_t iWidth, int32_t iHeight) { | 536 | int32_t iWidth, int32_t iHeight) { |
| 537 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | 537 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); |
| 538 | ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | 538 | ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); |
| @@ -550,7 +550,7 @@ static inline void_t McHorVer23_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 11 unmodified lines | |||
| 550 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight); | 550 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight); |
| 551 | } | 551 | } |
| 552 | } | 552 | } |
| 553 | static inline void_t McHorVer30_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 553 | static inline void McHorVer30_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 554 | int32_t iWidth, int32_t iHeight) { | 554 | int32_t iWidth, int32_t iHeight) { |
| 555 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | 555 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); |
| 556 | if (iWidth == 16) { | 556 | if (iWidth == 16) { |
| @@ -564,7 +564,7 @@ static inline void_t McHorVer30_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines | |||
| 564 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight); | 564 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight); |
| 565 | } | 565 | } |
| 566 | } | 566 | } |
| 567 | static inline void_t McHorVer31_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 567 | static inline void McHorVer31_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 568 | int32_t iWidth, int32_t iHeight) { | 568 | int32_t iWidth, int32_t iHeight) { |
| 569 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | 569 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); |
| 570 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | 570 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); |
| @@ -582,7 +582,7 @@ static inline void_t McHorVer31_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 11 unmodified lines | |||
| 582 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight); | 582 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight); |
| 583 | } | 583 | } |
| 584 | } | 584 | } |
| 585 | static inline void_t McHorVer32_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 585 | static inline void McHorVer32_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 586 | int32_t iWidth, int32_t iHeight) { | 586 | int32_t iWidth, int32_t iHeight) { |
| 587 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | 587 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); |
| 588 | ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); | 588 | ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16); |
| @@ -600,7 +600,7 @@ static inline void_t McHorVer32_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 11 unmodified lines | |||
| 600 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight); | 600 | PixelAvgWidthEq4_mmx (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight); |
| 601 | } | 601 | } |
| 602 | } | 602 | } |
| 603 | static inline void_t McHorVer33_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 603 | static inline void McHorVer33_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 604 | int32_t iWidth, int32_t iHeight) { | 604 | int32_t iWidth, int32_t iHeight) { |
| 605 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); | 605 | ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16); |
| 606 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); | 606 | ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16); |
| @@ -619,7 +619,7 @@ static inline void_t McHorVer33_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 12 unmodified lines | |||
| 619 | } | 619 | } |
| 620 | } | 620 | } |
| 621 | 621 | ||
| 622 | void_t McLuma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 622 | void McLuma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 623 | int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) | 623 | int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) |
| 624 | //pSrc has been added the offset of mv | 624 | //pSrc has been added the offset of mv |
| 625 | { | 625 | { |
| @@ -633,7 +633,7 @@ void_t McLuma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iD · 7 unmodified lines | |||
| 633 | pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); | 633 | pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight); |
| 634 | } | 634 | } |
| 635 | 635 | ||
| 636 | void_t McChroma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, | 636 | void McChroma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, |
| 637 | int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) { | 637 | int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) { |
| 638 | static const PMcChromaWidthExtFunc kpMcChromaWidthFuncs[2] = { | 638 | static const PMcChromaWidthExtFunc kpMcChromaWidthFuncs[2] = { |
| 639 | McChromaWidthEq4_mmx, | 639 | McChromaWidthEq4_mmx, |
| @@ -654,7 +654,7 @@ void_t McChroma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t · 14 unmodified lines | |||
| 654 | 654 | ||
| 655 | #endif //X86_ASM | 655 | #endif //X86_ASM |
| 656 | 656 | ||
| 657 | void_t InitMcFunc (SMcFunc* pMcFunc, int32_t iCpu) { | 657 | void InitMcFunc (SMcFunc* pMcFunc, int32_t iCpu) { |
| 658 | pMcFunc->pMcLumaFunc = McLuma_c; | 658 | pMcFunc->pMcLumaFunc = McLuma_c; |
| 659 | pMcFunc->pMcChromaFunc = McChroma_c; | 659 | pMcFunc->pMcChromaFunc = McChroma_c; |
| 660 | 660 | ||