#endif
-static inline void FUNC(idctRowCondDC)(DCTELEM *row, int extra_shift)
+static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift)
{
int a0, a1, a2, a3, b0, b1, b2, b3;
} while (0)
static inline void FUNC(idctSparseColPut)(pixel *dest, int line_size,
- DCTELEM *col)
+ int16_t *col)
{
int a0, a1, a2, a3, b0, b1, b2, b3;
- INIT_CLIP;
IDCT_COLS;
- dest[0] = CLIP((a0 + b0) >> COL_SHIFT);
+ dest[0] = av_clip_pixel((a0 + b0) >> COL_SHIFT);
dest += line_size;
- dest[0] = CLIP((a1 + b1) >> COL_SHIFT);
+ dest[0] = av_clip_pixel((a1 + b1) >> COL_SHIFT);
dest += line_size;
- dest[0] = CLIP((a2 + b2) >> COL_SHIFT);
+ dest[0] = av_clip_pixel((a2 + b2) >> COL_SHIFT);
dest += line_size;
- dest[0] = CLIP((a3 + b3) >> COL_SHIFT);
+ dest[0] = av_clip_pixel((a3 + b3) >> COL_SHIFT);
dest += line_size;
- dest[0] = CLIP((a3 - b3) >> COL_SHIFT);
+ dest[0] = av_clip_pixel((a3 - b3) >> COL_SHIFT);
dest += line_size;
- dest[0] = CLIP((a2 - b2) >> COL_SHIFT);
+ dest[0] = av_clip_pixel((a2 - b2) >> COL_SHIFT);
dest += line_size;
- dest[0] = CLIP((a1 - b1) >> COL_SHIFT);
+ dest[0] = av_clip_pixel((a1 - b1) >> COL_SHIFT);
dest += line_size;
- dest[0] = CLIP((a0 - b0) >> COL_SHIFT);
+ dest[0] = av_clip_pixel((a0 - b0) >> COL_SHIFT);
}
static inline void FUNC(idctSparseColAdd)(pixel *dest, int line_size,
- DCTELEM *col)
+ int16_t *col)
{
int a0, a1, a2, a3, b0, b1, b2, b3;
- INIT_CLIP;
IDCT_COLS;
- dest[0] = CLIP(dest[0] + ((a0 + b0) >> COL_SHIFT));
+ dest[0] = av_clip_pixel(dest[0] + ((a0 + b0) >> COL_SHIFT));
dest += line_size;
- dest[0] = CLIP(dest[0] + ((a1 + b1) >> COL_SHIFT));
+ dest[0] = av_clip_pixel(dest[0] + ((a1 + b1) >> COL_SHIFT));
dest += line_size;
- dest[0] = CLIP(dest[0] + ((a2 + b2) >> COL_SHIFT));
+ dest[0] = av_clip_pixel(dest[0] + ((a2 + b2) >> COL_SHIFT));
dest += line_size;
- dest[0] = CLIP(dest[0] + ((a3 + b3) >> COL_SHIFT));
+ dest[0] = av_clip_pixel(dest[0] + ((a3 + b3) >> COL_SHIFT));
dest += line_size;
- dest[0] = CLIP(dest[0] + ((a3 - b3) >> COL_SHIFT));
+ dest[0] = av_clip_pixel(dest[0] + ((a3 - b3) >> COL_SHIFT));
dest += line_size;
- dest[0] = CLIP(dest[0] + ((a2 - b2) >> COL_SHIFT));
+ dest[0] = av_clip_pixel(dest[0] + ((a2 - b2) >> COL_SHIFT));
dest += line_size;
- dest[0] = CLIP(dest[0] + ((a1 - b1) >> COL_SHIFT));
+ dest[0] = av_clip_pixel(dest[0] + ((a1 - b1) >> COL_SHIFT));
dest += line_size;
- dest[0] = CLIP(dest[0] + ((a0 - b0) >> COL_SHIFT));
+ dest[0] = av_clip_pixel(dest[0] + ((a0 - b0) >> COL_SHIFT));
}
-static inline void FUNC(idctSparseCol)(DCTELEM *col)
+static inline void FUNC(idctSparseCol)(int16_t *col)
{
int a0, a1, a2, a3, b0, b1, b2, b3;
col[56] = ((a0 - b0) >> COL_SHIFT);
}
-void FUNC(ff_simple_idct_put)(uint8_t *dest_, int line_size, DCTELEM *block)
+void FUNC(ff_simple_idct_put)(uint8_t *dest_, int line_size, int16_t *block)
{
pixel *dest = (pixel *)dest_;
int i;
FUNC(idctSparseColPut)(dest + i, line_size, block + i);
}
-void FUNC(ff_simple_idct_add)(uint8_t *dest_, int line_size, DCTELEM *block)
+void FUNC(ff_simple_idct_add)(uint8_t *dest_, int line_size, int16_t *block)
{
pixel *dest = (pixel *)dest_;
int i;
FUNC(idctSparseColAdd)(dest + i, line_size, block + i);
}
-void FUNC(ff_simple_idct)(DCTELEM *block)
+void FUNC(ff_simple_idct)(int16_t *block)
{
int i;