Unified · Split
| @@ -261,6 +261,24 @@ static inline void FUNC6(idctRowCondDC)(idctin *row, int extra_shift) · 260 unmodified lines | ||
| 261 | 261 | #ifdef EXTRA_SHIFT |
| 262 | 262 | static inline void FUNC(idctSparseCol_extrashift)(int16_t *col) |
| 263 | 263 | #else |
| 264 | +static inline void FUNC6(idctSparseCol)(idctin *col) | |
| 265 | +#endif | |
| 266 | +{ | |
| 267 | + unsigned a0, a1, a2, a3, b0, b1, b2, b3; | |
| 268 | + | |
| 269 | + IDCT_COLS; | |
| 270 | + | |
| 271 | + col[0 ] = ((int)(a0 + b0) >> COL_SHIFT); | |
| 272 | + col[8 ] = ((int)(a1 + b1) >> COL_SHIFT); | |
| 273 | + col[16] = ((int)(a2 + b2) >> COL_SHIFT); | |
| 274 | + col[24] = ((int)(a3 + b3) >> COL_SHIFT); | |
| 275 | + col[32] = ((int)(a3 - b3) >> COL_SHIFT); | |
| 276 | + col[40] = ((int)(a2 - b2) >> COL_SHIFT); | |
| 277 | + col[48] = ((int)(a1 - b1) >> COL_SHIFT); | |
| 278 | + col[56] = ((int)(a0 - b0) >> COL_SHIFT); | |
| 279 | +} | |
| 280 | + | |
| 281 | +#ifndef EXTRA_SHIFT | |
| 264 | 282 | static inline void FUNC6(idctSparseColPut)(pixel *dest, ptrdiff_t line_size, |
| 265 | 283 | idctin *col) |
| 266 | 284 | { |
| @@ -309,24 +327,6 @@ static inline void FUNC6(idctSparseColAdd)(pixel *dest, ptrdiff_t line_size, · 42 unmodified lines | ||
| 309 | 327 | dest[0] = av_clip_pixel(dest[0] + ((int)(a0 - b0) >> COL_SHIFT)); |
| 310 | 328 | } |
| 311 | 329 | |
| 312 | −static inline void FUNC6(idctSparseCol)(idctin *col) | |
| 313 | −#endif | |
| 314 | −{ | |
| 315 | − unsigned a0, a1, a2, a3, b0, b1, b2, b3; | |
| 316 | − | |
| 317 | − IDCT_COLS; | |
| 318 | − | |
| 319 | − col[0 ] = ((int)(a0 + b0) >> COL_SHIFT); | |
| 320 | − col[8 ] = ((int)(a1 + b1) >> COL_SHIFT); | |
| 321 | − col[16] = ((int)(a2 + b2) >> COL_SHIFT); | |
| 322 | − col[24] = ((int)(a3 + b3) >> COL_SHIFT); | |
| 323 | − col[32] = ((int)(a3 - b3) >> COL_SHIFT); | |
| 324 | − col[40] = ((int)(a2 - b2) >> COL_SHIFT); | |
| 325 | − col[48] = ((int)(a1 - b1) >> COL_SHIFT); | |
| 326 | − col[56] = ((int)(a0 - b0) >> COL_SHIFT); | |
| 327 | −} | |
| 328 | − | |
| 329 | −#ifndef EXTRA_SHIFT | |
| 330 | 330 | void FUNC6(ff_simple_idct_put)(uint8_t *dest_, ptrdiff_t line_size, int16_t *block_) |
| 331 | 331 | { |
| 332 | 332 | idctin *block = (idctin *)block_; |