diff options
| author | Tom Finegan <tomfinegan@google.com> | 2014-02-06 21:42:03 -0800 |
|---|---|---|
| committer | Tom Finegan <tomfinegan@google.com> | 2014-02-10 15:08:42 -0800 |
| commit | 60e91a92c39db67959456a99e554214a67065300 (patch) | |
| tree | 480ca3bd5523f5a6351373ee49ab9f8d7ceddca9 | |
| parent | c761bd78fa34d8f038f69b1daf8fd5f03b8c3eaa (diff) | |
| download | libvpx-60e91a92c39db67959456a99e554214a67065300.tar libvpx-60e91a92c39db67959456a99e554214a67065300.tar.gz libvpx-60e91a92c39db67959456a99e554214a67065300.tar.bz2 libvpx-60e91a92c39db67959456a99e554214a67065300.zip | |
vp9/common/x86: Silence MSVC warnings in vp9_asm_stubs.c.
Update filter_1dfunction definition to match usage.
Change-Id: Ie3cae13dc1ec3f5838c5f29d1c76a1a98a9217fa
| -rw-r--r-- | vp9/common/x86/vp9_asm_stubs.c | 60 |
1 files changed, 39 insertions, 21 deletions
diff --git a/vp9/common/x86/vp9_asm_stubs.c b/vp9/common/x86/vp9_asm_stubs.c index feb00985a..60018ea86 100644 --- a/vp9/common/x86/vp9_asm_stubs.c +++ b/vp9/common/x86/vp9_asm_stubs.c @@ -16,15 +16,15 @@ typedef void filter8_1dfunction ( const unsigned char *src_ptr, - const unsigned int src_pitch, + const ptrdiff_t src_pitch, unsigned char *output_ptr, - unsigned int out_pitch, + ptrdiff_t out_pitch, unsigned int output_height, const short *filter ); #define FUN_CONV_1D(name, step_q4, filter, dir, src_start, avg, opt) \ -void vp9_convolve8_##name##_##opt(const uint8_t *src, ptrdiff_t src_stride, \ + void vp9_convolve8_##name##_##opt(const uint8_t *src, ptrdiff_t src_stride, \ uint8_t *dst, ptrdiff_t dst_stride, \ const int16_t *filter_x, int x_step_q4, \ const int16_t *filter_y, int y_step_q4, \ @@ -32,50 +32,68 @@ void vp9_convolve8_##name##_##opt(const uint8_t *src, ptrdiff_t src_stride, \ if (step_q4 == 16 && filter[3] != 128) { \ if (filter[0] || filter[1] || filter[2]) { \ while (w >= 16) { \ - vp9_filter_block1d16_##dir##8_##avg##opt(src_start, src_stride, \ - dst, dst_stride, \ - h, filter); \ + vp9_filter_block1d16_##dir##8_##avg##opt(src_start, \ + src_stride, \ + dst, \ + dst_stride, \ + h, \ + filter); \ src += 16; \ dst += 16; \ w -= 16; \ } \ while (w >= 8) { \ - vp9_filter_block1d8_##dir##8_##avg##opt(src_start, src_stride, \ - dst, dst_stride, \ - h, filter); \ + vp9_filter_block1d8_##dir##8_##avg##opt(src_start, \ + src_stride, \ + dst, \ + dst_stride, \ + h, \ + filter); \ src += 8; \ dst += 8; \ w -= 8; \ } \ while (w >= 4) { \ - vp9_filter_block1d4_##dir##8_##avg##opt(src_start, src_stride, \ - dst, dst_stride, \ - h, filter); \ + vp9_filter_block1d4_##dir##8_##avg##opt(src_start, \ + src_stride, \ + dst, \ + dst_stride, \ + h, \ + filter); \ src += 4; \ dst += 4; \ w -= 4; \ } \ } else { \ while (w >= 16) { \ - vp9_filter_block1d16_##dir##2_##avg##opt(src, src_stride, \ - dst, dst_stride, \ - h, filter); \ + vp9_filter_block1d16_##dir##2_##avg##opt(src, \ + src_stride, \ + dst, \ + dst_stride, \ + h, \ + filter); \ src += 16; \ dst += 16; \ w -= 16; \ } \ while (w >= 8) { \ - vp9_filter_block1d8_##dir##2_##avg##opt(src, src_stride, \ - dst, dst_stride, \ - h, filter); \ + vp9_filter_block1d8_##dir##2_##avg##opt(src, \ + src_stride, \ + dst, \ + dst_stride, \ + h, \ + filter); \ src += 8; \ dst += 8; \ w -= 8; \ } \ while (w >= 4) { \ - vp9_filter_block1d4_##dir##2_##avg##opt(src, src_stride, \ - dst, dst_stride, \ - h, filter); \ + vp9_filter_block1d4_##dir##2_##avg##opt(src, \ + src_stride, \ + dst, \ + dst_stride, \ + h, \ + filter); \ src += 4; \ dst += 4; \ w -= 4; \ |