diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-01-08 10:29:22 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-01-08 12:54:45 -0800 |
| commit | 4455036cfc3c6b7fb9d7b85af1982e7df3711a05 (patch) | |
| tree | 4294eb7d43141c3406d3f3f184b522a1b052fadd /vp9/encoder/vp9_variance_c.c | |
| parent | 879cb7d96259a71eea0038452a00241650589084 (diff) | |
| download | libvpx-4455036cfc3c6b7fb9d7b85af1982e7df3711a05.tar libvpx-4455036cfc3c6b7fb9d7b85af1982e7df3711a05.tar.gz libvpx-4455036cfc3c6b7fb9d7b85af1982e7df3711a05.tar.bz2 libvpx-4455036cfc3c6b7fb9d7b85af1982e7df3711a05.zip | |
Merge superblocks (32x32) experiment.
Change-Id: I0df99742029834a85c4933652b0587cf5b6b2587
Diffstat (limited to 'vp9/encoder/vp9_variance_c.c')
| -rw-r--r-- | vp9/encoder/vp9_variance_c.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_variance_c.c b/vp9/encoder/vp9_variance_c.c index 9060d4c74..4eee6ae56 100644 --- a/vp9/encoder/vp9_variance_c.c +++ b/vp9/encoder/vp9_variance_c.c @@ -24,7 +24,7 @@ unsigned int vp9_get_mb_ss_c(const int16_t *src_ptr) { return sum; } -#if CONFIG_SUPERBLOCKS +#if CONFIG_SUPERBLOCKS64 unsigned int vp9_variance64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, @@ -37,6 +37,7 @@ unsigned int vp9_variance64x64_c(const uint8_t *src_ptr, *sse = var; return (var - (((int64_t)avg * avg) >> 12)); } +#endif // CONFIG_SUPERBLOCKS64 unsigned int vp9_variance32x32_c(const uint8_t *src_ptr, int source_stride, @@ -50,7 +51,6 @@ unsigned int vp9_variance32x32_c(const uint8_t *src_ptr, *sse = var; return (var - (((int64_t)avg * avg) >> 10)); } -#endif unsigned int vp9_variance16x16_c(const uint8_t *src_ptr, int source_stride, @@ -197,7 +197,7 @@ unsigned int vp9_sub_pixel_variance16x16_c(const uint8_t *src_ptr, return vp9_variance16x16_c(temp2, 16, dst_ptr, dst_pixels_per_line, sse); } -#if CONFIG_SUPERBLOCKS +#if CONFIG_SUPERBLOCKS64 unsigned int vp9_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int src_pixels_per_line, int xoffset, @@ -218,6 +218,7 @@ unsigned int vp9_sub_pixel_variance64x64_c(const uint8_t *src_ptr, return vp9_variance64x64_c(temp2, 64, dst_ptr, dst_pixels_per_line, sse); } +#endif // CONFIG_SUPERBLOCKS64 unsigned int vp9_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int src_pixels_per_line, @@ -238,7 +239,6 @@ unsigned int vp9_sub_pixel_variance32x32_c(const uint8_t *src_ptr, return vp9_variance32x32_c(temp2, 32, dst_ptr, dst_pixels_per_line, sse); } -#endif unsigned int vp9_variance_halfpixvar16x16_h_c(const uint8_t *src_ptr, int source_stride, @@ -249,7 +249,6 @@ unsigned int vp9_variance_halfpixvar16x16_h_c(const uint8_t *src_ptr, ref_ptr, recon_stride, sse); } -#if CONFIG_SUPERBLOCKS unsigned int vp9_variance_halfpixvar32x32_h_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, @@ -259,6 +258,7 @@ unsigned int vp9_variance_halfpixvar32x32_h_c(const uint8_t *src_ptr, ref_ptr, recon_stride, sse); } +#if CONFIG_SUPERBLOCKS64 unsigned int vp9_variance_halfpixvar64x64_h_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, @@ -267,7 +267,7 @@ unsigned int vp9_variance_halfpixvar64x64_h_c(const uint8_t *src_ptr, return vp9_sub_pixel_variance64x64_c(src_ptr, source_stride, 8, 0, ref_ptr, recon_stride, sse); } -#endif +#endif // CONFIG_SUPERBLOCKS64 unsigned int vp9_variance_halfpixvar16x16_v_c(const uint8_t *src_ptr, @@ -279,7 +279,6 @@ unsigned int vp9_variance_halfpixvar16x16_v_c(const uint8_t *src_ptr, ref_ptr, recon_stride, sse); } -#if CONFIG_SUPERBLOCKS unsigned int vp9_variance_halfpixvar32x32_v_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, @@ -289,6 +288,7 @@ unsigned int vp9_variance_halfpixvar32x32_v_c(const uint8_t *src_ptr, ref_ptr, recon_stride, sse); } +#if CONFIG_SUPERBLOCKS64 unsigned int vp9_variance_halfpixvar64x64_v_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, @@ -297,7 +297,8 @@ unsigned int vp9_variance_halfpixvar64x64_v_c(const uint8_t *src_ptr, return vp9_sub_pixel_variance64x64_c(src_ptr, source_stride, 0, 8, ref_ptr, recon_stride, sse); } -#endif +#endif // #if CONFIG_SUPERBLOCKS64 + unsigned int vp9_variance_halfpixvar16x16_hv_c(const uint8_t *src_ptr, int source_stride, @@ -308,7 +309,6 @@ unsigned int vp9_variance_halfpixvar16x16_hv_c(const uint8_t *src_ptr, ref_ptr, recon_stride, sse); } -#if CONFIG_SUPERBLOCKS unsigned int vp9_variance_halfpixvar32x32_hv_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, @@ -318,6 +318,7 @@ unsigned int vp9_variance_halfpixvar32x32_hv_c(const uint8_t *src_ptr, ref_ptr, recon_stride, sse); } +#if CONFIG_SUPERBLOCKS64 unsigned int vp9_variance_halfpixvar64x64_hv_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, @@ -326,7 +327,7 @@ unsigned int vp9_variance_halfpixvar64x64_hv_c(const uint8_t *src_ptr, return vp9_sub_pixel_variance64x64_c(src_ptr, source_stride, 8, 8, ref_ptr, recon_stride, sse); } -#endif +#endif // CONFIG_SUPERBLOCKS64 unsigned int vp9_sub_pixel_mse16x16_c(const uint8_t *src_ptr, int src_pixels_per_line, @@ -341,7 +342,6 @@ unsigned int vp9_sub_pixel_mse16x16_c(const uint8_t *src_ptr, return *sse; } -#if CONFIG_SUPERBLOCKS unsigned int vp9_sub_pixel_mse32x32_c(const uint8_t *src_ptr, int src_pixels_per_line, int xoffset, @@ -355,6 +355,7 @@ unsigned int vp9_sub_pixel_mse32x32_c(const uint8_t *src_ptr, return *sse; } +#if CONFIG_SUPERBLOCKS64 unsigned int vp9_sub_pixel_mse64x64_c(const uint8_t *src_ptr, int src_pixels_per_line, int xoffset, @@ -367,7 +368,7 @@ unsigned int vp9_sub_pixel_mse64x64_c(const uint8_t *src_ptr, dst_pixels_per_line, sse); return *sse; } -#endif +#endif // CONFIG_SUPERBLOCKS64 unsigned int vp9_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int src_pixels_per_line, |