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

Silence some warnings

Browse Source 
Change-Id: I8efb64eac3438484e7a77a8a1db198223fc52bfa
This commit is contained in:
Debargha Mukherjee
2016-10-04 14:30:16 -07:00
parent cb603790b0
commit 1ae9f2cfab
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
av1/encoder/mcomp.c
View File

@@ -2591,7 +2591,7 @@ int av1_find_best_masked_sub_pixel_tree_up(
if (use_upsampled_ref) if (use_upsampled_ref)
besterr = upsampled_setup_masked_center_error( besterr = upsampled_setup_masked_center_error(
xd, mask, mask_stride, bestmv, ref_mv, error_per_bit, vfp, z, 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); distortion);
else else
besterr = setup_masked_center_error( besterr = setup_masked_center_error(
@@ -3090,7 +3090,7 @@ int av1_find_best_obmc_sub_pixel_tree_up(
if (use_upsampled_ref) if (use_upsampled_ref)
besterr = upsampled_setup_obmc_center_error( besterr = upsampled_setup_obmc_center_error(
xd, mask, bestmv, ref_mv, error_per_bit, vfp, z, y, y_stride, w, h, 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 else
besterr = setup_obmc_center_error(mask, bestmv, ref_mv, error_per_bit, vfp, besterr = setup_obmc_center_error(mask, bestmv, ref_mv, error_per_bit, vfp,
z, y, y_stride, offset, mvjcost, mvcost, z, y, y_stride, offset, mvjcost, mvcost,

6
av1/encoder/rdopt.c
View File

@@ -2713,7 +2713,7 @@ static int64_t rd_pick_intra_sby_mode(AV1_COMP *cpi, MACROBLOCK *x, int *rate,
#endif // CONFIG_EXT_INTRA #endif // CONFIG_EXT_INTRA
this_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_distortion); this_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_distortion);
#if CONFIG_EXT_INTRA #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); filter_intra_mode_skip_mask ^= (1 << mic->mbmi.mode);
} }
#endif // CONFIG_EXT_INTRA #endif // CONFIG_EXT_INTRA
@@ -8958,7 +8958,7 @@ void av1_rd_pick_inter_mode_sb(AV1_COMP *cpi, TileDataEnc *tile_data,
backup_fmv[0] = frame_mv[NEWMV][ref_frame]; backup_fmv[0] = frame_mv[NEWMV][ref_frame];
if (comp_pred) backup_fmv[1] = frame_mv[NEWMV][second_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 (this_rd < INT64_MAX) {
if (RDCOST(x->rdmult, x->rddiv, rate_y + rate_uv, distortion2) < if (RDCOST(x->rdmult, x->rddiv, rate_y + rate_uv, distortion2) <
@@ -9049,7 +9049,7 @@ void av1_rd_pick_inter_mode_sb(AV1_COMP *cpi, TileDataEnc *tile_data,
uint8_t drl1_ctx = 0; uint8_t drl1_ctx = 0;
drl1_ctx = av1_drl_ctx(mbmi_ext->ref_mv_stack[ref_frame_type], drl1_ctx = av1_drl_ctx(mbmi_ext->ref_mv_stack[ref_frame_type],
i + idx_offset); 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] > if (mbmi_ext->ref_mv_count[ref_frame_type] >

4
av1/encoder/temporal_filter.c
View File

@@ -112,8 +112,8 @@ void av1_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride,
for (idy = -1; idy <= 1; ++idy) { for (idy = -1; idy <= 1; ++idy) {
for (idx = -1; idx <= 1; ++idx) { for (idx = -1; idx <= 1; ++idx) {
int row = i + idy; int row = (int)i + idy;
int col = j + idx; int col = (int)j + idx;
if (row >= 0 && row < (int)block_height && col >= 0 && if (row >= 0 && row < (int)block_height && col >= 0 &&
col < (int)block_width) { col < (int)block_width) {