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/hevcdsp_template.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/hevcdsp_template.c')
| -rw-r--r-- | libavcodec/hevcdsp_template.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c index b9b27f8c2b..e63d848304 100644 --- a/libavcodec/hevcdsp_template.c +++ b/libavcodec/hevcdsp_template.c @@ -543,7 +543,7 @@ static void FUNC(sao_edge_filter_1)(uint8_t *_dst, uint8_t *_src, //////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////// -static void FUNC(put_hevc_pel_pixels)(int16_t *dst, ptrdiff_t dststride, +static void FUNC(put_hevc_pel_pixels)(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) { @@ -555,7 +555,7 @@ static void FUNC(put_hevc_pel_pixels)(int16_t *dst, ptrdiff_t dststride, for (x = 0; x < width; x++) dst[x] = src[x] << (14 - BIT_DEPTH); src += srcstride; - dst += dststride; + dst += MAX_PB_SIZE; } } @@ -664,7 +664,7 @@ static void FUNC(put_hevc_pel_bi_w_pixels)(uint8_t *_dst, ptrdiff_t _dststride, filter[6] * src[x + 3 * stride] + \ filter[7] * src[x + 4 * stride]) -static void FUNC(put_hevc_qpel_h)(int16_t *dst, ptrdiff_t dststride, +static void FUNC(put_hevc_qpel_h)(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) { @@ -676,11 +676,11 @@ static void FUNC(put_hevc_qpel_h)(int16_t *dst, ptrdiff_t dststride, for (x = 0; x < width; x++) dst[x] = QPEL_FILTER(src, 1) >> (BIT_DEPTH - 8); src += srcstride; - dst += dststride; + dst += MAX_PB_SIZE; } } -static void FUNC(put_hevc_qpel_v)(int16_t *dst, ptrdiff_t dststride, +static void FUNC(put_hevc_qpel_v)(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) { @@ -692,12 +692,11 @@ static void FUNC(put_hevc_qpel_v)(int16_t *dst, ptrdiff_t dststride, for (x = 0; x < width; x++) dst[x] = QPEL_FILTER(src, srcstride) >> (BIT_DEPTH - 8); src += srcstride; - dst += dststride; + dst += MAX_PB_SIZE; } } static void FUNC(put_hevc_qpel_hv)(int16_t *dst, - ptrdiff_t dststride, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, @@ -725,7 +724,7 @@ static void FUNC(put_hevc_qpel_hv)(int16_t *dst, for (x = 0; x < width; x++) dst[x] = QPEL_FILTER(tmp, MAX_PB_SIZE) >> 6; tmp += MAX_PB_SIZE; - dst += dststride; + dst += MAX_PB_SIZE; } } @@ -1118,7 +1117,7 @@ static void FUNC(put_hevc_qpel_bi_w_hv)(uint8_t *_dst, ptrdiff_t _dststride, uin filter[2] * src[x + stride] + \ filter[3] * src[x + 2 * stride]) -static void FUNC(put_hevc_epel_h)(int16_t *dst, ptrdiff_t dststride, +static void FUNC(put_hevc_epel_h)(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) { @@ -1130,11 +1129,11 @@ static void FUNC(put_hevc_epel_h)(int16_t *dst, ptrdiff_t dststride, for (x = 0; x < width; x++) dst[x] = EPEL_FILTER(src, 1) >> (BIT_DEPTH - 8); src += srcstride; - dst += dststride; + dst += MAX_PB_SIZE; } } -static void FUNC(put_hevc_epel_v)(int16_t *dst, ptrdiff_t dststride, +static void FUNC(put_hevc_epel_v)(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) { @@ -1147,11 +1146,11 @@ static void FUNC(put_hevc_epel_v)(int16_t *dst, ptrdiff_t dststride, for (x = 0; x < width; x++) dst[x] = EPEL_FILTER(src, srcstride) >> (BIT_DEPTH - 8); src += srcstride; - dst += dststride; + dst += MAX_PB_SIZE; } } -static void FUNC(put_hevc_epel_hv)(int16_t *dst, ptrdiff_t dststride, +static void FUNC(put_hevc_epel_hv)(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width) { @@ -1178,7 +1177,7 @@ static void FUNC(put_hevc_epel_hv)(int16_t *dst, ptrdiff_t dststride, for (x = 0; x < width; x++) dst[x] = EPEL_FILTER(tmp, MAX_PB_SIZE) >> 6; tmp += MAX_PB_SIZE; - dst += dststride; + dst += MAX_PB_SIZE; } } |