Commit 45392679 authored by James Zern's avatar James Zern Committed by Gerrit Code Review

Merge "Fix Visual Studio build failure in filter_selectively_vert_row2() calls"

parents 03a401c4 304d3109
...@@ -1302,15 +1302,24 @@ void vp9_filter_block_plane_ss00(VP9_COMMON *const cm, ...@@ -1302,15 +1302,24 @@ void vp9_filter_block_plane_ss00(VP9_COMMON *const cm,
// Disable filtering on the leftmost column. // Disable filtering on the leftmost column.
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth) { if (cm->use_highbitdepth) {
highbd_filter_selectively_vert_row2( highbd_filter_selectively_vert_row2(plane->subsampling_x,
plane->subsampling_x, CONVERT_TO_SHORTPTR(dst->buf), dst->stride, CONVERT_TO_SHORTPTR(dst->buf),
mask_16x16, mask_8x8, mask_4x4, mask_4x4_int, cm->lf_info.lfthr, dst->stride,
&lfm->lfl_y[r << 3], (int)cm->bit_depth); (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 { } else {
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
filter_selectively_vert_row2( filter_selectively_vert_row2(plane->subsampling_x, dst->buf, dst->stride,
plane->subsampling_x, dst->buf, dst->stride, mask_16x16, mask_8x8, (unsigned int)mask_16x16,
mask_4x4, mask_4x4_int, cm->lf_info.lfthr, &lfm->lfl_y[r << 3]); (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 #if CONFIG_VP9_HIGHBITDEPTH
} }
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
...@@ -1395,14 +1404,20 @@ void vp9_filter_block_plane_ss11(VP9_COMMON *const cm, ...@@ -1395,14 +1404,20 @@ void vp9_filter_block_plane_ss11(VP9_COMMON *const cm,
if (cm->use_highbitdepth) { if (cm->use_highbitdepth) {
highbd_filter_selectively_vert_row2(plane->subsampling_x, highbd_filter_selectively_vert_row2(plane->subsampling_x,
CONVERT_TO_SHORTPTR(dst->buf), CONVERT_TO_SHORTPTR(dst->buf),
dst->stride, mask_16x16, mask_8x8, dst->stride,
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], cm->lf_info.lfthr, &lfl_uv[r << 1],
(int)cm->bit_depth); (int)cm->bit_depth);
} else { } else {
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
filter_selectively_vert_row2(plane->subsampling_x, dst->buf, dst->stride, 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]); cm->lf_info.lfthr, &lfl_uv[r << 1]);
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment