Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n0.11
| @@ -28,7 +28,7 @@ | |||||
| +3*((src)[-2*stride] + (src)[3*stride]) \ | +3*((src)[-2*stride] + (src)[3*stride]) \ | ||||
| -1*((src)[-3*stride] + (src)[4*stride]) + 16) >> 5) | -1*((src)[-3*stride] + (src)[4*stride]) + 16) >> 5) | ||||
| static void dirac_hpel_filter(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, uint8_t *src, | |||||
| static void dirac_hpel_filter(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, const uint8_t *src, | |||||
| int stride, int width, int height) | int stride, int width, int height) | ||||
| { | { | ||||
| int x, y; | int x, y; | ||||
| @@ -98,7 +98,7 @@ PIXOP_BILINEAR(avg, OP_AVG, 32) | |||||
| block += stride; \ | block += stride; \ | ||||
| } \ | } \ | ||||
| } \ | } \ | ||||
| static void biweight_dirac_pixels ## W ## _c(uint8_t *dst, uint8_t *src, int stride, int log2_denom, \ | |||||
| static void biweight_dirac_pixels ## W ## _c(uint8_t *dst, const uint8_t *src, int stride, int log2_denom, \ | |||||
| int weightd, int weights, int h) { \ | int weightd, int weights, int h) { \ | ||||
| int x; \ | int x; \ | ||||
| while (h--) { \ | while (h--) { \ | ||||
| @@ -24,10 +24,10 @@ | |||||
| #include <stdint.h> | #include <stdint.h> | ||||
| typedef void (*dirac_weight_func)(uint8_t *block, int stride, int log2_denom, int weight, int h); | typedef void (*dirac_weight_func)(uint8_t *block, int stride, int log2_denom, int weight, int h); | ||||
| typedef void (*dirac_biweight_func)(uint8_t *dst, uint8_t *src, int stride, int log2_denom, int weightd, int weights, int h); | |||||
| typedef void (*dirac_biweight_func)(uint8_t *dst, const uint8_t *src, int stride, int log2_denom, int weightd, int weights, int h); | |||||
| typedef struct { | typedef struct { | ||||
| void (*dirac_hpel_filter)(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, uint8_t *src, int stride, int width, int height); | |||||
| void (*dirac_hpel_filter)(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, const uint8_t *src, int stride, int width, int height); | |||||
| /** | /** | ||||
| * dirac_pixels_tab[width][subpel] | * dirac_pixels_tab[width][subpel] | ||||
| * width is 2 for 32, 1 for 16, 0 for 8 | * width is 2 for 32, 1 for 16, 0 for 8 | ||||
| @@ -27,11 +27,11 @@ void ff_put_signed_rect_clamped_mmx(uint8_t *dst, int dst_stride, const int16_t | |||||
| void ff_put_signed_rect_clamped_sse2(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height); | void ff_put_signed_rect_clamped_sse2(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height); | ||||
| #define HPEL_FILTER(MMSIZE, EXT) \ | #define HPEL_FILTER(MMSIZE, EXT) \ | ||||
| void ff_dirac_hpel_filter_v_ ## EXT(uint8_t *, uint8_t *, int, int); \ | |||||
| void ff_dirac_hpel_filter_h_ ## EXT(uint8_t *, uint8_t *, int); \ | |||||
| void ff_dirac_hpel_filter_v_ ## EXT(uint8_t *, const uint8_t *, int, int); \ | |||||
| void ff_dirac_hpel_filter_h_ ## EXT(uint8_t *, const uint8_t *, int); \ | |||||
| \ | \ | ||||
| static void dirac_hpel_filter_ ## EXT(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, \ | static void dirac_hpel_filter_ ## EXT(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, \ | ||||
| uint8_t *src, int stride, int width, int height) \ | |||||
| const uint8_t *src, int stride, int width, int height) \ | |||||
| { \ | { \ | ||||
| while( height-- ) \ | while( height-- ) \ | ||||
| { \ | { \ | ||||