diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2014-02-05 07:59:45 +0000 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2014-02-06 22:45:29 +0100 |
| commit | 5351964a2b524d1cb70c268c3e9436fd2990429b (patch) | |
| tree | 9453d0fed67f050d80022bc1242825f634928d55 | |
| parent | 49ec5515956405a240b0f2a092d927104874b16a (diff) | |
| download | ffmpeg-5351964a2b524d1cb70c268c3e9436fd2990429b.tar.gz | |
vp8: fix bilinear C code to work if src_stride != dst_stride.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| -rw-r--r-- | libavcodec/vp8dsp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c index 34e2da0c34..0978da58d5 100644 --- a/libavcodec/vp8dsp.c +++ b/libavcodec/vp8dsp.c @@ -415,7 +415,7 @@ VP8_EPEL_HV(8, 6, 6) VP8_EPEL_HV(4, 6, 6) #define VP8_BILINEAR(SIZE) \ -static void put_vp8_bilinear ## SIZE ## _h_c(uint8_t *dst, ptrdiff_t stride, uint8_t *src, ptrdiff_t s2, int h, int mx, int my) \ +static void put_vp8_bilinear ## SIZE ## _h_c(uint8_t *dst, ptrdiff_t dstride, uint8_t *src, ptrdiff_t sstride, int h, int mx, int my) \ { \ int a = 8-mx, b = mx; \ int x, y; \ @@ -423,24 +423,24 @@ static void put_vp8_bilinear ## SIZE ## _h_c(uint8_t *dst, ptrdiff_t stride, uin for (y = 0; y < h; y++) { \ for (x = 0; x < SIZE; x++) \ dst[x] = (a*src[x] + b*src[x+1] + 4) >> 3; \ - dst += stride; \ - src += stride; \ + dst += dstride; \ + src += sstride; \ } \ } \ -static void put_vp8_bilinear ## SIZE ## _v_c(uint8_t *dst, ptrdiff_t stride, uint8_t *src, ptrdiff_t s2, int h, int mx, int my) \ +static void put_vp8_bilinear ## SIZE ## _v_c(uint8_t *dst, ptrdiff_t dstride, uint8_t *src, ptrdiff_t sstride, int h, int mx, int my) \ { \ int c = 8-my, d = my; \ int x, y; \ \ for (y = 0; y < h; y++) { \ for (x = 0; x < SIZE; x++) \ - dst[x] = (c*src[x] + d*src[x+stride] + 4) >> 3; \ - dst += stride; \ - src += stride; \ + dst[x] = (c*src[x] + d*src[x+sstride] + 4) >> 3; \ + dst += dstride; \ + src += sstride; \ } \ } \ \ -static void put_vp8_bilinear ## SIZE ## _hv_c(uint8_t *dst, ptrdiff_t stride, uint8_t *src, ptrdiff_t s2, int h, int mx, int my) \ +static void put_vp8_bilinear ## SIZE ## _hv_c(uint8_t *dst, ptrdiff_t dstride, uint8_t *src, ptrdiff_t sstride, int h, int mx, int my) \ { \ int a = 8-mx, b = mx; \ int c = 8-my, d = my; \ @@ -452,7 +452,7 @@ static void put_vp8_bilinear ## SIZE ## _hv_c(uint8_t *dst, ptrdiff_t stride, ui for (x = 0; x < SIZE; x++) \ tmp[x] = (a*src[x] + b*src[x+1] + 4) >> 3; \ tmp += SIZE; \ - src += stride; \ + src += sstride; \ } \ \ tmp = tmp_array; \ @@ -460,7 +460,7 @@ static void put_vp8_bilinear ## SIZE ## _hv_c(uint8_t *dst, ptrdiff_t stride, ui for (y = 0; y < h; y++) { \ for (x = 0; x < SIZE; x++) \ dst[x] = (c*tmp[x] + d*tmp[x+SIZE] + 4) >> 3; \ - dst += stride; \ + dst += dstride; \ tmp += SIZE; \ } \ } |