generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better block error computation

Browse Source 
Shift is applied after high-precision arithmetic rather than
before.

Change-Id: Ibd178fe8d10600935f6d5e790e89f3b2f8b4afcf
This commit is contained in:
Deb Mukherjee
2014-06-09 17:41:42 -07:00
parent 4320ac26ee
commit f08489e609
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vp9/encoder/vp9_rdopt.c
View File

@@ -571,16 +571,17 @@ int64_t vp9_high_block_error_c(const tran_low_t *coeff,
int64_t *ssz, int bps) {
int i;
int64_t error = 0, sqcoeff = 0;
int shift = bps - 8;
int shift = 2 * (bps - 8);
int rounding = shift > 0 ? 1 << (shift - 1) : 0;
for (i = 0; i < block_size; i++) {
const int diff = coeff[i] - dqcoeff[i];
error += ((diff + rounding) >> shift) * ((diff + rounding) >> shift);
sqcoeff += ((coeff[i] + rounding) >> shift) *
((coeff[i] + rounding) >> shift);
const int64_t diff = coeff[i] - dqcoeff[i];
error += diff * diff;
sqcoeff += (int64_t)coeff[i] * (int64_t)coeff[i];
}
assert(error >= 0 && sqcoeff >= 0);
error = (error + rounding) >> shift;
sqcoeff = (sqcoeff + rounding) >> shift;
*ssz = sqcoeff;
return error;