diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-05-13 10:11:42 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2014-05-14 03:17:31 -0700 |
| commit | 7ab9a9587b96db4edce6be916c1f02297a9555ff (patch) | |
| tree | 8f014d6eaff3fae057b599a3f8080ab7e2c5cb13 /vp9/encoder/vp9_sad.c | |
| parent | 38f3cf125efe262f661d4f1e95d6eba0fb349e57 (diff) | |
| download | libvpx-7ab9a9587b96db4edce6be916c1f02297a9555ff.tar libvpx-7ab9a9587b96db4edce6be916c1f02297a9555ff.tar.gz libvpx-7ab9a9587b96db4edce6be916c1f02297a9555ff.tar.bz2 libvpx-7ab9a9587b96db4edce6be916c1f02297a9555ff.zip | |
Remove Wextra warnings from vp9_sad.c
As a side-effect, the max_sad check is removed from the
C-implementation of VP8, for consistency with VP9, and to
ensure that the SAD tests common to VP8/VP9 pass.
That will make the VP8 C implementation of sad a little slower
but given that is rarely used in practice, the impact will be
minimal.
Change-Id: I7f43089fdea047fbf1862e40c21e4715c30f07ca
Diffstat (limited to 'vp9/encoder/vp9_sad.c')
| -rw-r--r-- | vp9/encoder/vp9_sad.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_sad.c b/vp9/encoder/vp9_sad.c index 892e90551..d06263676 100644 --- a/vp9/encoder/vp9_sad.c +++ b/vp9/encoder/vp9_sad.c @@ -35,14 +35,12 @@ static INLINE unsigned int sad(const uint8_t *a, int a_stride, #define sadMxN(m, n) \ unsigned int vp9_sad##m##x##n##_c(const uint8_t *src, int src_stride, \ - const uint8_t *ref, int ref_stride, \ - unsigned int max_sad) { \ + const uint8_t *ref, int ref_stride) { \ return sad(src, src_stride, ref, ref_stride, m, n); \ } \ unsigned int vp9_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 max_sad) { \ + const uint8_t *second_pred) { \ uint8_t comp_pred[m * n]; \ vp9_comp_avg_pred(comp_pred, second_pred, m, n, ref, ref_stride); \ return sad(src, src_stride, comp_pred, m, m, n); \ @@ -54,8 +52,7 @@ void vp9_sad##m##x##n##x##k##_c(const uint8_t *src, int src_stride, \ unsigned int *sads) { \ int i; \ for (i = 0; i < k; ++i) \ - sads[i] = vp9_sad##m##x##n##_c(src, src_stride, &ref[i], ref_stride, \ - 0x7fffffff); \ + sads[i] = vp9_sad##m##x##n##_c(src, src_stride, &ref[i], ref_stride); \ } #define sadMxNx4D(m, n) \ @@ -64,8 +61,7 @@ void vp9_sad##m##x##n##x4d_c(const uint8_t *src, int src_stride, \ unsigned int *sads) { \ int i; \ for (i = 0; i < 4; ++i) \ - sads[i] = vp9_sad##m##x##n##_c(src, src_stride, refs[i], ref_stride, \ - 0x7fffffff); \ + sads[i] = vp9_sad##m##x##n##_c(src, src_stride, refs[i], ref_stride); \ } // 64x64 |