diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2014-07-28 17:17:26 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 14:57:37 +0200 |
| commit | d4f44b66d36c405d5152d8d333cc4a35c7766af0 (patch) | |
| tree | a477404f49f43123bba39e73cf934721c1b07d09 /libavcodec/x86/hevcdsp_init.c | |
| parent | b9f3912a65ac98b7bc6916c9e3a9d60d79637416 (diff) | |
| download | ffmpeg-d4f44b66d36c405d5152d8d333cc4a35c7766af0.tar.gz | |
hevcdsp: remove compilation-time-fixed parameter
The dststride parameter is always MAX_PB_SIZE.
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/hevcdsp_init.c')
| -rw-r--r-- | libavcodec/x86/hevcdsp_init.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c index 07091589be..0c83a0a15e 100644 --- a/libavcodec/x86/hevcdsp_init.c +++ b/libavcodec/x86/hevcdsp_init.c @@ -72,7 +72,7 @@ IDCT_FUNCS(16x16, avx2); IDCT_FUNCS(32x32, avx2); #define mc_rep_func(name, bitd, step, W, opt) \ -void ff_hevc_put_hevc_##name##W##_##bitd##_##opt(int16_t *_dst, ptrdiff_t dststride, \ +void ff_hevc_put_hevc_##name##W##_##bitd##_##opt(int16_t *_dst, \ uint8_t *_src, ptrdiff_t _srcstride, int height, \ intptr_t mx, intptr_t my, int width) \ { \ @@ -82,7 +82,7 @@ void ff_hevc_put_hevc_##name##W##_##bitd##_##opt(int16_t *_dst, ptrdiff_t dststr for (i = 0; i < W; i += step) { \ src = _src + (i * ((bitd + 7) / 8)); \ dst = _dst + i; \ - ff_hevc_put_hevc_##name##step##_##bitd##_##opt(dst, dststride, src, _srcstride, height, mx, my, width); \ + ff_hevc_put_hevc_##name##step##_##bitd##_##opt(dst, src, _srcstride, height, mx, my, width); \ } \ } #define mc_rep_uni_func(name, bitd, step, W, opt) \ @@ -327,9 +327,9 @@ void ff_hevc_put_hevc_uni_w_##name##W##_##bitd##_##opt(uint8_t *_dst, ptrdiff_t int _wx, int _ox, \ intptr_t mx, intptr_t my, int width) \ { \ - LOCAL_ALIGNED_16(int16_t, temp, [71 * 64]); \ - ff_hevc_put_hevc_##name##W##_##bitd##_##opt(temp, 64, _src, _srcstride, height, mx, my, width); \ - ff_hevc_put_hevc_uni_w##W##_##bitd##_##opt(_dst, _dststride, temp, 64, height, denom, _wx, _ox);\ + LOCAL_ALIGNED_16(int16_t, temp, [71 * MAX_PB_SIZE]); \ + ff_hevc_put_hevc_##name##W##_##bitd##_##opt(temp, _src, _srcstride, height, mx, my, width); \ + ff_hevc_put_hevc_uni_w##W##_##bitd##_##opt(_dst, _dststride, temp, MAX_PB_SIZE, height, denom, _wx, _ox);\ } #define mc_uni_w_funcs(name, bitd, opt) \ @@ -386,9 +386,9 @@ void ff_hevc_put_hevc_bi_w_##name##W##_##bitd##_##opt(uint8_t *_dst, ptrdiff_t _ int _wx0, int _wx1, int _ox0, int _ox1, \ intptr_t mx, intptr_t my, int width) \ { \ - LOCAL_ALIGNED_16(int16_t, temp, [71 * 64]); \ - ff_hevc_put_hevc_##name##W##_##bitd##_##opt(temp, 64, _src, _srcstride, height, mx, my, width); \ - ff_hevc_put_hevc_bi_w##W##_##bitd##_##opt(_dst, _dststride, temp, 64, _src2, _src2stride, \ + LOCAL_ALIGNED_16(int16_t, temp, [71 * MAX_PB_SIZE]); \ + ff_hevc_put_hevc_##name##W##_##bitd##_##opt(temp, _src, _srcstride, height, mx, my, width); \ + ff_hevc_put_hevc_bi_w##W##_##bitd##_##opt(_dst, _dststride, temp, MAX_PB_SIZE, _src2, _src2stride, \ height, denom, _wx0, _wx1, _ox0, _ox1); \ } |