Revert "Merge "Change highbd variance rounding to prevent negative variance.""

This reverts commit ea48370a50, reversing
changes made to 15939cb2d7.

The commit was insufficiently tested and causes failures.

Change-Id: I623d6fc2cd3ae6fd42d0abab1f8eada465ae57a7
This commit is contained in:
Alex Converse
2016-01-13 11:18:19 -08:00
parent ea48370a50
commit ed3df445d9
4 changed files with 24 additions and 23 deletions

View File

@@ -54,11 +54,11 @@ static void RoundHighBitDepth(int bit_depth, int64_t *se, uint64_t *sse) {
switch (bit_depth) {
case VPX_BITS_12:
*sse = (*sse + 128) >> 8;
*se = *se / (1 << 4);
*se = (*se + 8) >> 4;
break;
case VPX_BITS_10:
*sse = (*sse + 8) >> 4;
*se = *se / (1 << 2);
*se = (*se + 2) >> 2;
break;
case VPX_BITS_8:
default: