diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-07-10 11:17:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-10 18:27:24 -0700 |
| commit | decead7336246aa9f17469ae784c1ba0dc24b210 (patch) | |
| tree | e268f83f3ac2f17500b198f1151d0cf95dbee3bc /vp9/common/vp9_convolve.h | |
| parent | c13e0bcb520d64c0b08222355ad86c8feb637b4e (diff) | |
| download | libvpx-decead7336246aa9f17469ae784c1ba0dc24b210.tar libvpx-decead7336246aa9f17469ae784c1ba0dc24b210.tar.gz libvpx-decead7336246aa9f17469ae784c1ba0dc24b210.tar.bz2 libvpx-decead7336246aa9f17469ae784c1ba0dc24b210.zip | |
Replace copy_memNxM functions with a generic copy/avg function.
Change-Id: I3ce849452ed4f08527de9565a9914d5ee36170aa
Diffstat (limited to 'vp9/common/vp9_convolve.h')
| -rw-r--r-- | vp9/common/vp9_convolve.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/vp9/common/vp9_convolve.h b/vp9/common/vp9_convolve.h index 0596080c0..3de81119f 100644 --- a/vp9/common/vp9_convolve.h +++ b/vp9/common/vp9_convolve.h @@ -13,26 +13,12 @@ #include "./vpx_config.h" #include "vpx/vpx_integer.h" -typedef void (*convolve_fn_t)(const uint8_t *src, int src_stride, - uint8_t *dst, int dst_stride, +typedef void (*convolve_fn_t)(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, int w, int h); -// Not a convolution, a block copy conforming to the convolution prototype -void vp9_convolve_copy(const uint8_t *src, int src_stride, - uint8_t *dst, int dst_stride, - const int16_t *filter_x, int x_step_q4, - const int16_t *filter_y, int y_step_q4, - int w, int h); - -// Not a convolution, a block average conforming to the convolution prototype -void vp9_convolve_avg(const uint8_t *src, int src_stride, - uint8_t *dst, int dst_stride, - const int16_t *filter_x, int x_step_q4, - const int16_t *filter_y, int y_step_q4, - int w, int h); - struct subpix_fn_table { const int16_t (*filter_x)[8]; const int16_t (*filter_y)[8]; |