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

Merge "Fix unsigned overflow in rd_variance_adjustment."

Browse Source
This commit is contained in:
Alex Converse 2015-11-20 17:41:58 +00:00 committed by Gerrit Code Review
commit d37c78819a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp10/encoder/rdopt.c
View File

@ -3017,9 +3017,9 @@ static void rd_variance_adjustment(VP10_COMP *cpi,
? (source_variance - recon_variance) ? (source_variance - recon_variance)
: (recon_variance - source_variance); : (recon_variance - source_variance);
var_error = (200 * source_variance * recon_variance) / var_error = ((int64_t)200 * source_variance * recon_variance) /
((source_variance * source_variance) + (((int64_t)source_variance * source_variance) +
(recon_variance * recon_variance)); ((int64_t)recon_variance * recon_variance));
var_error = 100 - var_error; var_error = 100 - var_error;
} }

6
vp9/encoder/vp9_rdopt.c
View File

@ -2831,9 +2831,9 @@ static void rd_variance_adjustment(VP9_COMP *cpi,
? (source_variance - recon_variance) ? (source_variance - recon_variance)
: (recon_variance - source_variance); : (recon_variance - source_variance);
var_error = (200 * source_variance * recon_variance) / var_error = ((int64_t)200 * source_variance * recon_variance) /
((source_variance * source_variance) + (((int64_t)source_variance * source_variance) +
(recon_variance * recon_variance)); ((int64_t)recon_variance * recon_variance));
var_error = 100 - var_error; var_error = 100 - var_error;
} }