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

Merge "Fix arithmetic overflow warnings."

Browse Source
This commit is contained in:
Marco 2015-02-27 11:53:57 -08:00 committed by Gerrit Code Review
commit 2b0ed0842f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_aq_cyclicrefresh.c
View File

@ -368,9 +368,11 @@ void vp9_cyclic_refresh_setup(VP9_COMP *const cpi) {
cr->time_for_refresh = 0; cr->time_for_refresh = 0;
// Set rate threshold to some multiple (set to 2 for now) of the target // Set rate threshold to some multiple (set to 2 for now) of the target
// rate (target is given by sb64_target_rate and scaled by 256). // rate (target is given by sb64_target_rate and scaled by 256).
cr->thresh_rate_sb = (rc->sb64_target_rate << 8) << 1; cr->thresh_rate_sb = ((int64_t)(rc->sb64_target_rate) << 8) << 1;
// Distortion threshold, quadratic in Q, scale factor to be adjusted. // Distortion threshold, quadratic in Q, scale factor to be adjusted.
cr->thresh_dist_sb = (int)(q * q) << 2; // q will not exceed 457, so (q * q) is within 32bit; see:
// vp9_convert_qindex_to_q(), vp9_ac_quant(), ac_qlookup*[].
cr->thresh_dist_sb = ((int64_t)(q * q)) << 2;
cr->motion_thresh = 32; cr->motion_thresh = 32;
// Set up segmentation. // Set up segmentation.
// Clear down the segment map. // Clear down the segment map.