diff options
author | Johann <johannkoenig@google.com> | 2015-05-26 23:02:10 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-26 23:02:11 +0000 |
commit | dee70d355fc6a2aeb3ede8062c58cd2bc7d71e75 (patch) | |
tree | 82ea38422963e8c88e70bdddaa1f31010b10ef91 /vp9/encoder/vp9_pickmode.c | |
parent | 9ae5fb706ebb0a29fb7b887fcbacb0d294a5751a (diff) | |
parent | c3bdffb0a508ad08d5dfa613c029f368d4293d4c (diff) | |
download | libvpx-dee70d355fc6a2aeb3ede8062c58cd2bc7d71e75.tar libvpx-dee70d355fc6a2aeb3ede8062c58cd2bc7d71e75.tar.gz libvpx-dee70d355fc6a2aeb3ede8062c58cd2bc7d71e75.tar.bz2 libvpx-dee70d355fc6a2aeb3ede8062c58cd2bc7d71e75.zip |
Merge "Move variance functions to vpx_dsp"
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
-rw-r--r-- | vp9/encoder/vp9_pickmode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 872a441c4..887236281 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -14,6 +14,7 @@ #include <stdio.h> #include "./vp9_rtcd.h" +#include "./vpx_dsp_rtcd.h" #include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem.h" @@ -215,7 +216,7 @@ static void block_variance(const uint8_t *src, int src_stride, for (i = 0; i < h; i += block_size) { for (j = 0; j < w; j += block_size) { - vp9_get8x8var(src + src_stride * i + j, src_stride, + vpx_get8x8var(src + src_stride * i + j, src_stride, ref + ref_stride * i + j, ref_stride, &sse8x8[k], &sum8x8[k]); *sse += sse8x8[k]; |