diff options
author | Deb Mukherjee <debargha@google.com> | 2014-10-08 12:43:22 -0700 |
---|---|---|
committer | Deb Mukherjee <debargha@google.com> | 2014-10-09 14:40:40 -0700 |
commit | 1929c9b39198719c9b5a102385b56a0b909e1dfd (patch) | |
tree | 7fdf6e216b43db4034b6f83dd1b15bfd27d863c7 /vp9/encoder/vp9_sad.c | |
parent | ab35f9817ea27e84ca63e4a62eb6ceb2f27b22b2 (diff) | |
download | libvpx-1929c9b39198719c9b5a102385b56a0b909e1dfd.tar libvpx-1929c9b39198719c9b5a102385b56a0b909e1dfd.tar.gz libvpx-1929c9b39198719c9b5a102385b56a0b909e1dfd.tar.bz2 libvpx-1929c9b39198719c9b5a102385b56a0b909e1dfd.zip |
Rename highbitdepth functions to use highbd prefix
Uses highbd_ prefix convention consistently.
Change-Id: I58f7f799a7ff8e32701bcd71c955bcf1cdd4581e
Diffstat (limited to 'vp9/encoder/vp9_sad.c')
-rw-r--r-- | vp9/encoder/vp9_sad.c | 145 |
1 files changed, 75 insertions, 70 deletions
diff --git a/vp9/encoder/vp9_sad.c b/vp9/encoder/vp9_sad.c index cee6ce140..73134f2f2 100644 --- a/vp9/encoder/vp9_sad.c +++ b/vp9/encoder/vp9_sad.c @@ -32,7 +32,6 @@ static INLINE unsigned int sad(const uint8_t *a, int a_stride, a += a_stride; b += b_stride; } - return sad; } @@ -136,9 +135,9 @@ sadMxNxK(4, 4, 8) sadMxNx4D(4, 4) #if CONFIG_VP9_HIGHBITDEPTH -static INLINE unsigned int high_sad(const uint8_t *a8, int a_stride, - const uint8_t *b8, int b_stride, - int width, int height) { +static INLINE unsigned int highbd_sad(const uint8_t *a8, int a_stride, + const uint8_t *b8, int b_stride, + int width, int height) { int y, x; unsigned int sad = 0; const uint16_t *a = CONVERT_TO_SHORTPTR(a8); @@ -153,9 +152,9 @@ static INLINE unsigned int high_sad(const uint8_t *a8, int a_stride, return sad; } -static INLINE unsigned int high_sadb(const uint8_t *a8, int a_stride, - const uint16_t *b, int b_stride, - int width, int height) { +static INLINE unsigned int highbd_sadb(const uint8_t *a8, int a_stride, + const uint16_t *b, int b_stride, + int width, int height) { int y, x; unsigned int sad = 0; const uint16_t *a = CONVERT_TO_SHORTPTR(a8); @@ -169,103 +168,109 @@ static INLINE unsigned int high_sadb(const uint8_t *a8, int a_stride, return sad; } -#define high_sadMxN(m, n) \ -unsigned int vp9_high_sad##m##x##n##_c(const uint8_t *src, int src_stride, \ - const uint8_t *ref, int ref_stride) { \ - return high_sad(src, src_stride, ref, ref_stride, m, n); \ +#define highbd_sadMxN(m, n) \ +unsigned int vp9_highbd_sad##m##x##n##_c(const uint8_t *src, int src_stride, \ + const uint8_t *ref, int ref_stride) { \ + return highbd_sad(src, src_stride, ref, ref_stride, m, n); \ } \ -unsigned int vp9_high_sad##m##x##n##_avg_c(const uint8_t *src, int src_stride, \ - const uint8_t *ref, int ref_stride, \ - const uint8_t *second_pred) { \ +unsigned int vp9_highbd_sad##m##x##n##_avg_c(const uint8_t *src, \ + int src_stride, \ + const uint8_t *ref, \ + int ref_stride, \ + const uint8_t *second_pred) { \ uint16_t comp_pred[m * n]; \ - vp9_high_comp_avg_pred(comp_pred, second_pred, m, n, ref, ref_stride); \ - return high_sadb(src, src_stride, comp_pred, m, m, n); \ + vp9_highbd_comp_avg_pred(comp_pred, second_pred, m, n, ref, ref_stride); \ + return highbd_sadb(src, src_stride, comp_pred, m, m, n); \ } -#define high_sadMxNxK(m, n, k) \ -void vp9_high_sad##m##x##n##x##k##_c(const uint8_t *src, int src_stride, \ - const uint8_t *ref, int ref_stride, \ - unsigned int *sads) { \ +#define highbd_sadMxNxK(m, n, k) \ +void vp9_highbd_sad##m##x##n##x##k##_c(const uint8_t *src, int src_stride, \ + const uint8_t *ref, int ref_stride, \ + unsigned int *sads) { \ int i; \ - for (i = 0; i < k; ++i) \ - sads[i] = vp9_high_sad##m##x##n##_c(src, src_stride, &ref[i], ref_stride); \ + for (i = 0; i < k; ++i) { \ + sads[i] = vp9_highbd_sad##m##x##n##_c(src, src_stride, &ref[i], \ + ref_stride); \ + } \ } -#define high_sadMxNx4D(m, n) \ -void vp9_high_sad##m##x##n##x4d_c(const uint8_t *src, int src_stride, \ - const uint8_t *const refs[], \ - int ref_stride, unsigned int *sads) { \ +#define highbd_sadMxNx4D(m, n) \ +void vp9_highbd_sad##m##x##n##x4d_c(const uint8_t *src, int src_stride, \ + const uint8_t *const refs[], \ + int ref_stride, unsigned int *sads) { \ int i; \ - for (i = 0; i < 4; ++i) \ - sads[i] = vp9_high_sad##m##x##n##_c(src, src_stride, refs[i], ref_stride); \ + for (i = 0; i < 4; ++i) { \ + sads[i] = vp9_highbd_sad##m##x##n##_c(src, src_stride, refs[i], \ + ref_stride); \ + } \ } // 64x64 -high_sadMxN(64, 64) -high_sadMxNxK(64, 64, 3) -high_sadMxNxK(64, 64, 8) -high_sadMxNx4D(64, 64) +highbd_sadMxN(64, 64) +highbd_sadMxNxK(64, 64, 3) +highbd_sadMxNxK(64, 64, 8) +highbd_sadMxNx4D(64, 64) // 64x32 -high_sadMxN(64, 32) -high_sadMxNx4D(64, 32) +highbd_sadMxN(64, 32) +highbd_sadMxNx4D(64, 32) // 32x64 -high_sadMxN(32, 64) -high_sadMxNx4D(32, 64) +highbd_sadMxN(32, 64) +highbd_sadMxNx4D(32, 64) // 32x32 -high_sadMxN(32, 32) -high_sadMxNxK(32, 32, 3) -high_sadMxNxK(32, 32, 8) -high_sadMxNx4D(32, 32) +highbd_sadMxN(32, 32) +highbd_sadMxNxK(32, 32, 3) +highbd_sadMxNxK(32, 32, 8) +highbd_sadMxNx4D(32, 32) // 32x16 -high_sadMxN(32, 16) -high_sadMxNx4D(32, 16) +highbd_sadMxN(32, 16) +highbd_sadMxNx4D(32, 16) // 16x32 -high_sadMxN(16, 32) -high_sadMxNx4D(16, 32) +highbd_sadMxN(16, 32) +highbd_sadMxNx4D(16, 32) // 16x16 -high_sadMxN(16, 16) -high_sadMxNxK(16, 16, 3) -high_sadMxNxK(16, 16, 8) -high_sadMxNx4D(16, 16) +highbd_sadMxN(16, 16) +highbd_sadMxNxK(16, 16, 3) +highbd_sadMxNxK(16, 16, 8) +highbd_sadMxNx4D(16, 16) // 16x8 -high_sadMxN(16, 8) -high_sadMxNxK(16, 8, 3) -high_sadMxNxK(16, 8, 8) -high_sadMxNx4D(16, 8) +highbd_sadMxN(16, 8) +highbd_sadMxNxK(16, 8, 3) +highbd_sadMxNxK(16, 8, 8) +highbd_sadMxNx4D(16, 8) // 8x16 -high_sadMxN(8, 16) -high_sadMxNxK(8, 16, 3) -high_sadMxNxK(8, 16, 8) -high_sadMxNx4D(8, 16) +highbd_sadMxN(8, 16) +highbd_sadMxNxK(8, 16, 3) +highbd_sadMxNxK(8, 16, 8) +highbd_sadMxNx4D(8, 16) // 8x8 -high_sadMxN(8, 8) -high_sadMxNxK(8, 8, 3) -high_sadMxNxK(8, 8, 8) -high_sadMxNx4D(8, 8) +highbd_sadMxN(8, 8) +highbd_sadMxNxK(8, 8, 3) +highbd_sadMxNxK(8, 8, 8) +highbd_sadMxNx4D(8, 8) // 8x4 -high_sadMxN(8, 4) -high_sadMxNxK(8, 4, 8) -high_sadMxNx4D(8, 4) +highbd_sadMxN(8, 4) +highbd_sadMxNxK(8, 4, 8) +highbd_sadMxNx4D(8, 4) // 4x8 -high_sadMxN(4, 8) -high_sadMxNxK(4, 8, 8) -high_sadMxNx4D(4, 8) +highbd_sadMxN(4, 8) +highbd_sadMxNxK(4, 8, 8) +highbd_sadMxNx4D(4, 8) // 4x4 -high_sadMxN(4, 4) -high_sadMxNxK(4, 4, 3) -high_sadMxNxK(4, 4, 8) -high_sadMxNx4D(4, 4) +highbd_sadMxN(4, 4) +highbd_sadMxNxK(4, 4, 3) +highbd_sadMxNxK(4, 4, 8) +highbd_sadMxNx4D(4, 4) #endif // CONFIG_VP9_HIGHBITDEPTH |