Silence some warnings Change-Id: I8efb64eac3438484e7a77a8a1db198223fc52bfa
diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c index 9e63c0f..9ea9ede 100644 --- a/av1/encoder/mcomp.c +++ b/av1/encoder/mcomp.c
@@ -2591,7 +2591,7 @@ if (use_upsampled_ref) besterr = upsampled_setup_masked_center_error( xd, mask, mask_stride, bestmv, ref_mv, error_per_bit, vfp, z, - src_stride, y, y_stride, w, h, (offset << 3), mvjcost, mvcost, sse1, + src_stride, y, y_stride, w, h, (offset * 8), mvjcost, mvcost, sse1, distortion); else besterr = setup_masked_center_error( @@ -3090,7 +3090,7 @@ if (use_upsampled_ref) besterr = upsampled_setup_obmc_center_error( xd, mask, bestmv, ref_mv, error_per_bit, vfp, z, y, y_stride, w, h, - (offset << 3), mvjcost, mvcost, sse1, distortion); + (offset * 8), mvjcost, mvcost, sse1, distortion); else besterr = setup_obmc_center_error(mask, bestmv, ref_mv, error_per_bit, vfp, z, y, y_stride, offset, mvjcost, mvcost,
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c index 2966e77..948995d 100644 --- a/av1/encoder/rdopt.c +++ b/av1/encoder/rdopt.c
@@ -2713,7 +2713,7 @@ #endif // CONFIG_EXT_INTRA this_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_distortion); #if CONFIG_EXT_INTRA - if (best_rd == INT64_MAX || this_rd < (best_rd + (best_rd >> 4))) { + if (best_rd == INT64_MAX || this_rd - best_rd < (best_rd >> 4)) { filter_intra_mode_skip_mask ^= (1 << mic->mbmi.mode); } #endif // CONFIG_EXT_INTRA @@ -8958,7 +8958,7 @@ backup_fmv[0] = frame_mv[NEWMV][ref_frame]; if (comp_pred) backup_fmv[1] = frame_mv[NEWMV][second_ref_frame]; - rate2 += cpi->drl_mode_cost0[drl_ctx][0]; + rate2 += (rate2 < INT_MAX ? cpi->drl_mode_cost0[drl_ctx][0] : 0); if (this_rd < INT64_MAX) { if (RDCOST(x->rdmult, x->rddiv, rate_y + rate_uv, distortion2) < @@ -9049,7 +9049,7 @@ uint8_t drl1_ctx = 0; drl1_ctx = av1_drl_ctx(mbmi_ext->ref_mv_stack[ref_frame_type], i + idx_offset); - tmp_rate += cpi->drl_mode_cost0[drl1_ctx][1]; + tmp_rate += (tmp_rate < INT_MAX ? cpi->drl_mode_cost0[drl1_ctx][1] : 0); } if (mbmi_ext->ref_mv_count[ref_frame_type] >
diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c index 909d539..dafb6ff 100644 --- a/av1/encoder/temporal_filter.c +++ b/av1/encoder/temporal_filter.c
@@ -112,8 +112,8 @@ for (idy = -1; idy <= 1; ++idy) { for (idx = -1; idx <= 1; ++idx) { - int row = i + idy; - int col = j + idx; + int row = (int)i + idy; + int col = (int)j + idx; if (row >= 0 && row < (int)block_height && col >= 0 && col < (int)block_width) {