diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-05-05 19:09:57 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-05 19:09:57 -0700 |
| commit | a4533957b00df72b2728d5bccdea6950a060554e (patch) | |
| tree | bd282fc94791f84234667761030318f2d207848c /vp9 | |
| parent | 6b4efa493a242b2d067b7523cf6bf7e4ba62e627 (diff) | |
| parent | 4498194bad77689131bb2e6e5661e7394de88dde (diff) | |
| download | libvpx-a4533957b00df72b2728d5bccdea6950a060554e.tar libvpx-a4533957b00df72b2728d5bccdea6950a060554e.tar.gz libvpx-a4533957b00df72b2728d5bccdea6950a060554e.tar.bz2 libvpx-a4533957b00df72b2728d5bccdea6950a060554e.zip | |
Merge "Cleaning up vp9_variance.c"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_variance.c | 69 |
1 files changed, 23 insertions, 46 deletions
diff --git a/vp9/encoder/vp9_variance.c b/vp9/encoder/vp9_variance.c index ae3c86aee..324a1de84 100644 --- a/vp9/encoder/vp9_variance.c +++ b/vp9/encoder/vp9_variance.c @@ -113,12 +113,9 @@ unsigned int vp9_get_mb_ss_c(const int16_t *src_ptr) { unsigned int vp9_variance##W##x##H##_c(const uint8_t *a, int a_stride, \ const uint8_t *b, int b_stride, \ unsigned int *sse) { \ - unsigned int var; \ - int avg; \ -\ - variance(a, a_stride, b, b_stride, W, H, &var, &avg); \ - *sse = var; \ - return var - (((int64_t)avg * avg) / (W * H)); \ + int sum; \ + variance(a, a_stride, b, b_stride, W, H, sse, &sum); \ + return *sse - (((int64_t)sum * sum) / (W * H)); \ } #define SUBPIX_VAR(W, H) \ @@ -172,56 +169,36 @@ void vp9_get_sse_sum_8x8_c(const uint8_t *src_ptr, int source_stride, variance(src_ptr, source_stride, ref_ptr, ref_stride, 8, 8, sse, sum); } -unsigned int vp9_mse16x16_c(const uint8_t *src_ptr, - int source_stride, - const uint8_t *ref_ptr, - int recon_stride, +unsigned int vp9_mse16x16_c(const uint8_t *src, int src_stride, + const uint8_t *ref, int ref_stride, unsigned int *sse) { - unsigned int var; - int avg; - - variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 16, &var, &avg); - *sse = var; - return var; + int sum; + variance(src, src_stride, ref, ref_stride, 16, 16, sse, &sum); + return *sse; } -unsigned int vp9_mse16x8_c(const uint8_t *src_ptr, - int source_stride, - const uint8_t *ref_ptr, - int recon_stride, +unsigned int vp9_mse16x8_c(const uint8_t *src, int src_stride, + const uint8_t *ref, int ref_stride, unsigned int *sse) { - unsigned int var; - int avg; - - variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 8, &var, &avg); - *sse = var; - return var; + int sum; + variance(src, src_stride, ref, ref_stride, 16, 8, sse, &sum); + return *sse; } -unsigned int vp9_mse8x16_c(const uint8_t *src_ptr, - int source_stride, - const uint8_t *ref_ptr, - int recon_stride, +unsigned int vp9_mse8x16_c(const uint8_t *src, int src_stride, + const uint8_t *ref, int ref_stride, unsigned int *sse) { - unsigned int var; - int avg; - - variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 16, &var, &avg); - *sse = var; - return var; + int sum; + variance(src, src_stride, ref, ref_stride, 8, 16, sse, &sum); + return *sse; } -unsigned int vp9_mse8x8_c(const uint8_t *src_ptr, - int source_stride, - const uint8_t *ref_ptr, - int recon_stride, +unsigned int vp9_mse8x8_c(const uint8_t *src, int src_stride, + const uint8_t *ref, int ref_stride, unsigned int *sse) { - unsigned int var; - int avg; - - variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 8, &var, &avg); - *sse = var; - return var; + int sum; + variance(src, src_stride, ref, ref_stride, 8, 8, sse, &sum); + return *sse; } VAR(4, 4) |