diff options
| author | James Zern <jzern@google.com> | 2016-06-03 20:07:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-03 20:07:47 +0000 |
| commit | 453926791641a617e17fc8182f9d1763ae070ef5 (patch) | |
| tree | 3b80da547248bb3319910900eadf3dbac1139489 /vp9 | |
| parent | 03a401c4d9c17b1bbf2462e751758daa0a3daa6c (diff) | |
| parent | 304d31097571c62b0a1c580cf7a488fc793a85e5 (diff) | |
| download | libvpx-453926791641a617e17fc8182f9d1763ae070ef5.tar libvpx-453926791641a617e17fc8182f9d1763ae070ef5.tar.gz libvpx-453926791641a617e17fc8182f9d1763ae070ef5.tar.bz2 libvpx-453926791641a617e17fc8182f9d1763ae070ef5.zip | |
Merge "Fix Visual Studio build failure in filter_selectively_vert_row2() calls"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_loopfilter.c | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index d41d45e8a..183dec4e7 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -1302,15 +1302,24 @@ void vp9_filter_block_plane_ss00(VP9_COMMON *const cm, // Disable filtering on the leftmost column. #if CONFIG_VP9_HIGHBITDEPTH if (cm->use_highbitdepth) { - highbd_filter_selectively_vert_row2( - plane->subsampling_x, CONVERT_TO_SHORTPTR(dst->buf), dst->stride, - mask_16x16, mask_8x8, mask_4x4, mask_4x4_int, cm->lf_info.lfthr, - &lfm->lfl_y[r << 3], (int)cm->bit_depth); + highbd_filter_selectively_vert_row2(plane->subsampling_x, + CONVERT_TO_SHORTPTR(dst->buf), + dst->stride, + (unsigned int)mask_16x16, + (unsigned int)mask_8x8, + (unsigned int)mask_4x4, + (unsigned int)mask_4x4_int, + cm->lf_info.lfthr, + &lfm->lfl_y[r << 3], + (int)cm->bit_depth); } else { #endif // CONFIG_VP9_HIGHBITDEPTH - filter_selectively_vert_row2( - plane->subsampling_x, dst->buf, dst->stride, mask_16x16, mask_8x8, - mask_4x4, mask_4x4_int, cm->lf_info.lfthr, &lfm->lfl_y[r << 3]); + filter_selectively_vert_row2(plane->subsampling_x, dst->buf, dst->stride, + (unsigned int)mask_16x16, + (unsigned int)mask_8x8, + (unsigned int)mask_4x4, + (unsigned int)mask_4x4_int, + cm->lf_info.lfthr, &lfm->lfl_y[r << 3]); #if CONFIG_VP9_HIGHBITDEPTH } #endif // CONFIG_VP9_HIGHBITDEPTH @@ -1395,14 +1404,20 @@ void vp9_filter_block_plane_ss11(VP9_COMMON *const cm, if (cm->use_highbitdepth) { highbd_filter_selectively_vert_row2(plane->subsampling_x, CONVERT_TO_SHORTPTR(dst->buf), - dst->stride, mask_16x16, mask_8x8, - mask_4x4, mask_4x4_int, + dst->stride, + (unsigned int)mask_16x16, + (unsigned int)mask_8x8, + (unsigned int)mask_4x4, + (unsigned int)mask_4x4_int, cm->lf_info.lfthr, &lfl_uv[r << 1], (int)cm->bit_depth); } else { #endif // CONFIG_VP9_HIGHBITDEPTH filter_selectively_vert_row2(plane->subsampling_x, dst->buf, dst->stride, - mask_16x16, mask_8x8, mask_4x4, mask_4x4_int, + (unsigned int)mask_16x16, + (unsigned int)mask_8x8, + (unsigned int)mask_4x4, + (unsigned int)mask_4x4_int, cm->lf_info.lfthr, &lfl_uv[r << 1]); #if CONFIG_VP9_HIGHBITDEPTH } |