LineageOS/android_external_libvpx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vp9: Fix ubsan failure in denoiser.

Browse Source 
Fix the overflow for subtraction between two unsigned integers.

BUG=webm:1432

Change-Id: I7b665e93ba5850548810eff23258782c4f5ee15a
This commit is contained in:
Jerome Jiang
2017-05-09 10:49:59 -07:00
parent ecd1eb2162
commit 597d1f4c03
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vp9/encoder/vp9_denoiser.c
View File

@@ -191,7 +191,9 @@ static VP9_DENOISER_DECISION perform_motion_compensation(
int increase_denoising, int mi_row, int mi_col, PICK_MODE_CONTEXT *ctx, int increase_denoising, int mi_row, int mi_col, PICK_MODE_CONTEXT *ctx,
int motion_magnitude, int is_skin, int *zeromv_filter, int consec_zeromv, int motion_magnitude, int is_skin, int *zeromv_filter, int consec_zeromv,
int num_spatial_layers, int width) { int num_spatial_layers, int width) {
int sse_diff = ctx->zeromv_sse - ctx->newmv_sse; const int sse_diff = (ctx->newmv_sse == UINT_MAX)
? 0
: ((int)ctx->zeromv_sse - (int)ctx->newmv_sse);
MV_REFERENCE_FRAME frame; MV_REFERENCE_FRAME frame;
MACROBLOCKD *filter_mbd = &mb->e_mbd; MACROBLOCKD *filter_mbd = &mb->e_mbd;
MODE_INFO *mi = filter_mbd->mi[0]; MODE_INFO *mi = filter_mbd->mi[0];
@@ -217,7 +219,6 @@ static VP9_DENOISER_DECISION perform_motion_compensation(
// difference in sum-squared-error, use it. // difference in sum-squared-error, use it.
if (frame != INTRA_FRAME && if (frame != INTRA_FRAME &&
(frame != GOLDEN_FRAME || num_spatial_layers == 1) && (frame != GOLDEN_FRAME || num_spatial_layers == 1) &&
ctx->newmv_sse != UINT_MAX &&
sse_diff > sse_diff_thresh(bs, increase_denoising, motion_magnitude)) { sse_diff > sse_diff_thresh(bs, increase_denoising, motion_magnitude)) {
mi->ref_frame[0] = ctx->best_reference_frame; mi->ref_frame[0] = ctx->best_reference_frame;
mi->mode = ctx->best_sse_inter_mode; mi->mode = ctx->best_sse_inter_mode;