diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2014-05-01 18:40:24 -0700 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2014-05-05 19:12:38 -0700 |
commit | e8bbb3d9db797dab7c2f947cc43e8d0f168e4953 (patch) | |
tree | 98699b3ae43c42ce792f713610bafc8c050170be /vp9/encoder | |
parent | ec234eb5e10759c762b2ef555e712d1f99e1e2a4 (diff) | |
download | libvpx-e8bbb3d9db797dab7c2f947cc43e8d0f168e4953.tar libvpx-e8bbb3d9db797dab7c2f947cc43e8d0f168e4953.tar.gz libvpx-e8bbb3d9db797dab7c2f947cc43e8d0f168e4953.tar.bz2 libvpx-e8bbb3d9db797dab7c2f947cc43e8d0f168e4953.zip |
Making vp9_get_sse_sum_{8x8, 16x16} static.
Change-Id: Ifb7937c977308c682986f0ce9645a0807d2aa46a
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 23 | ||||
-rw-r--r-- | vp9/encoder/vp9_variance.c | 13 |
2 files changed, 17 insertions, 19 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 19aa592f2..ef1d4e60e 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -70,6 +70,18 @@ static const uint8_t VP9_VAR_OFFS[64] = { 128, 128, 128, 128, 128, 128, 128, 128 }; +static void get_sse_sum_8x8(const uint8_t *src, int src_stride, + const uint8_t *ref, int ref_stride, + unsigned int *sse, int *sum) { + variance(src, src_stride, ref, ref_stride, 8, 8, sse, sum); +} + +static void get_sse_sum_16x16(const uint8_t *src, int src_stride, + const uint8_t *ref, int ref_stride, + unsigned int *sse, int *sum) { + variance(src, src_stride, ref, ref_stride, 16, 16, sse, sum); +} + static unsigned int get_sby_perpixel_variance(VP9_COMP *cpi, const struct buf_2d *ref, BLOCK_SIZE bs) { @@ -475,8 +487,8 @@ static void choose_partitioning(VP9_COMP *cpi, unsigned int sse = 0; int sum = 0; if (x_idx < pixels_wide && y_idx < pixels_high) - vp9_get_sse_sum_8x8(s + y_idx * sp + x_idx, sp, - d + y_idx * dp + x_idx, dp, &sse, &sum); + get_sse_sum_8x8(s + y_idx * sp + x_idx, sp, + d + y_idx * dp + x_idx, dp, &sse, &sum); fill_variance(sse, sum, 64, &vst->split[k].part_variances.none); } } @@ -1211,10 +1223,9 @@ static void set_source_var_based_partition(VP9_COMP *cpi, int b_offset = b_mi_row * MI_SIZE * src_stride + b_mi_col * MI_SIZE; - vp9_get_sse_sum_16x16(src + b_offset, - src_stride, - pre_src + b_offset, - pre_stride, &d16[j].sse, &d16[j].sum); + get_sse_sum_16x16(src + b_offset, src_stride, + pre_src + b_offset, pre_stride, + &d16[j].sse, &d16[j].sum); d16[j].var = d16[j].sse - (((uint32_t)d16[j].sum * d16[j].sum) >> 8); diff --git a/vp9/encoder/vp9_variance.c b/vp9/encoder/vp9_variance.c index 324a1de84..91d8ea4dc 100644 --- a/vp9/encoder/vp9_variance.c +++ b/vp9/encoder/vp9_variance.c @@ -156,19 +156,6 @@ unsigned int vp9_sub_pixel_avg_variance##W##x##H##_c( \ return vp9_variance##W##x##H##_c(temp3, W, dst, dst_stride, sse); \ } - -void vp9_get_sse_sum_16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t *ref_ptr, int ref_stride, - unsigned int *sse, int *sum) { - variance(src_ptr, source_stride, ref_ptr, ref_stride, 16, 16, sse, sum); -} - -void vp9_get_sse_sum_8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t *ref_ptr, int ref_stride, - unsigned int *sse, int *sum) { - variance(src_ptr, source_stride, ref_ptr, ref_stride, 8, 8, sse, sum); -} - unsigned int vp9_mse16x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, unsigned int *sse) { |