diff options
author | Diego Biurrun <diego@biurrun.de> | 2016-08-23 23:19:30 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2016-08-26 11:36:26 +0200 |
commit | 6892df9294d93322d43255ada299507465bc93c8 (patch) | |
tree | 0863d2a8f4e13a7db2d5a623b9036e5d86a24bc8 /libavcodec/vp3dsp.c | |
parent | 963b3ab11f98fcc4a311f0dc7b268890c5675da2 (diff) | |
download | ffmpeg-6892df9294d93322d43255ada299507465bc93c8.tar.gz |
vp3: Change type of stride parameters to ptrdiff_t
This avoids SIMD-optimized functions having to sign-extend their
stride argument manually to be able to do pointer arithmetic.
Also adjust parameter names to be "stride" everywhere.
Diffstat (limited to 'libavcodec/vp3dsp.c')
-rw-r--r-- | libavcodec/vp3dsp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index ab65f2b763..459441ea07 100644 --- a/libavcodec/vp3dsp.c +++ b/libavcodec/vp3dsp.c @@ -44,7 +44,7 @@ #define M(a, b) (((a) * (b)) >> 16) -static av_always_inline void idct(uint8_t *dst, int stride, +static av_always_inline void idct(uint8_t *dst, ptrdiff_t stride, int16_t *input, int type) { int16_t *ip = input; @@ -195,21 +195,21 @@ static av_always_inline void idct(uint8_t *dst, int stride, } } -static void vp3_idct_put_c(uint8_t *dest /* align 8 */, int line_size, +static void vp3_idct_put_c(uint8_t *dest /* align 8 */, ptrdiff_t stride, int16_t *block /* align 16 */) { - idct(dest, line_size, block, 1); + idct(dest, stride, block, 1); memset(block, 0, sizeof(*block) * 64); } -static void vp3_idct_add_c(uint8_t *dest /* align 8 */, int line_size, +static void vp3_idct_add_c(uint8_t *dest /* align 8 */, ptrdiff_t stride, int16_t *block /* align 16 */) { - idct(dest, line_size, block, 2); + idct(dest, stride, block, 2); memset(block, 0, sizeof(*block) * 64); } -static void vp3_idct_dc_add_c(uint8_t *dest /* align 8 */, int line_size, +static void vp3_idct_dc_add_c(uint8_t *dest /* align 8 */, ptrdiff_t stride, int16_t *block /* align 16 */) { int i, dc = (block[0] + 15) >> 5; @@ -223,17 +223,17 @@ static void vp3_idct_dc_add_c(uint8_t *dest /* align 8 */, int line_size, dest[5] = av_clip_uint8(dest[5] + dc); dest[6] = av_clip_uint8(dest[6] + dc); dest[7] = av_clip_uint8(dest[7] + dc); - dest += line_size; + dest += stride; } block[0] = 0; } -static void vp3_v_loop_filter_c(uint8_t *first_pixel, int stride, +static void vp3_v_loop_filter_c(uint8_t *first_pixel, ptrdiff_t stride, int *bounding_values) { unsigned char *end; int filter_value; - const int nstride = -stride; + const ptrdiff_t nstride = -stride; for (end = first_pixel + 8; first_pixel < end; first_pixel++) { filter_value = (first_pixel[2 * nstride] - first_pixel[stride]) + @@ -245,7 +245,7 @@ static void vp3_v_loop_filter_c(uint8_t *first_pixel, int stride, } } -static void vp3_h_loop_filter_c(uint8_t *first_pixel, int stride, +static void vp3_h_loop_filter_c(uint8_t *first_pixel, ptrdiff_t stride, int *bounding_values) { unsigned char *end; |