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

Fix rounding in ARNR calculation

Browse Source 
The rounding of the ARNR filter output prior to
normalization by the filter strength was incorrect
when strength = 0.

In this case 1 << (strength - 1) would not create the
required rounding of 0, rather it would outrange. This
patch fixes this issue.

Change-Id: I771809ba34d6052b17d34c870ea11ff67b418dab
This commit is contained in:
Adrian Grange 2014-05-05 09:39:24 -07:00
parent 1b7291d52c
commit 928b34e895
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vp8/encoder/temporal_filter.c
View File

@ -98,6 +98,7 @@ void vp8_temporal_filter_apply_c
unsigned int i, j, k; unsigned int i, j, k;
int modifier; int modifier;
int byte = 0; int byte = 0;
const int rounding = strength > 0 ? 1 << (strength - 1) : 0;
for (i = 0,k = 0; i < block_size; i++) for (i = 0,k = 0; i < block_size; i++)
{ {
@ -114,7 +115,7 @@ void vp8_temporal_filter_apply_c
*/ */
modifier *= modifier; modifier *= modifier;
modifier *= 3; modifier *= 3;
modifier += 1 << (strength - 1); modifier += rounding;
modifier >>= strength; modifier >>= strength;
if (modifier > 16) if (modifier > 16)

3
vp9/encoder/vp9_temporal_filter.c
View File

@ -99,6 +99,7 @@ void vp9_temporal_filter_apply_c(uint8_t *frame1,
unsigned int i, j, k; unsigned int i, j, k;
int modifier; int modifier;
int byte = 0; int byte = 0;
const int rounding = strength > 0 ? 1 << (strength - 1) : 0;
for (i = 0, k = 0; i < block_size; i++) { for (i = 0, k = 0; i < block_size; i++) {
for (j = 0; j < block_size; j++, k++) { for (j = 0; j < block_size; j++, k++) {
@ -111,7 +112,7 @@ void vp9_temporal_filter_apply_c(uint8_t *frame1,
// modifier = (int)roundf(coeff > 16 ? 0 : 16-coeff); // modifier = (int)roundf(coeff > 16 ? 0 : 16-coeff);
modifier *= modifier; modifier *= modifier;
modifier *= 3; modifier *= 3;
modifier += 1 << (strength - 1); modifier += rounding;
modifier >>= strength; modifier >>= strength;
if (modifier > 16) if (modifier > 16)