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

Fix Visual Studio build failure in filter_selectively_vert_row2() calls

Browse Source 
Error messages:
 ..\vp9\common\vp9_loopfilter.c(1312): warning C4244: 'function' :
conversion from 'uint64_t' to 'unsigned int', possible loss of data
[.build-x86_64-win64-vs10\vpx.vcxproj]

..\vp9\common\vp9_loopfilter.c(1313): warning C4244: 'function' :
conversion from 'uint64_t' to 'unsigned int', possible loss of data
[.build-x86_64-win64-vs10\vpx.vcxproj]

..\vp9\common\vp9_loopfilter.c(1312): error C2220: warning treated as
error - no 'object' file generated
[.build-x86_64-win64-vs10\vpx.vcxproj]

Change-Id: Ia69260611997cd2ba41c7184a85ecead740a7c07
This commit is contained in:
Linfeng Zhang 2016-06-03 09:28:11 -07:00
parent a8c8bf1c99
commit 304d310975
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vp9/common/vp9_loopfilter.c
View File

@ -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,
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
} }