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

Merge "Pick up bit-depth from the right place" into nextgenv2

Browse Source
This commit is contained in:
Debargha Mukherjee
2016-05-24 17:33:22 +00:00
committed by Gerrit Code Review
parent a63147ae77 62b6331753
commit 416da08102
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vp10/common/reconinter.c
View File

@@ -530,7 +530,7 @@ void vp10_make_masked_inter_predictor(
mi->mbmi.interinter_wedge_index, mi->mbmi.interinter_wedge_index,
mi->mbmi.interinter_wedge_sign, mi->mbmi.interinter_wedge_sign,
mi->mbmi.sb_type, mi->mbmi.sb_type,
wedge_offset_x, wedge_offset_y, h, w, xd->cur_buf->bit_depth); wedge_offset_x, wedge_offset_y, h, w, xd->bd);
else else
build_masked_compound_wedge_extend( build_masked_compound_wedge_extend(
dst, dst_stride, tmp_dst, MAX_SB_SIZE, dst, dst_stride, tmp_dst, MAX_SB_SIZE,
@@ -544,7 +544,7 @@ void vp10_make_masked_inter_predictor(
dst, dst_stride, tmp_dst, MAX_SB_SIZE, dst, dst_stride, tmp_dst, MAX_SB_SIZE,
mi->mbmi.interinter_wedge_index, mi->mbmi.interinter_wedge_index,
mi->mbmi.interinter_wedge_sign, mi->mbmi.interinter_wedge_sign,
mi->mbmi.sb_type, h, w, xd->cur_buf->bit_depth); mi->mbmi.sb_type, h, w, xd->bd);
else else
build_masked_compound_wedge( build_masked_compound_wedge(
dst, dst_stride, tmp_dst, MAX_SB_SIZE, dst, dst_stride, tmp_dst, MAX_SB_SIZE,
@@ -2418,7 +2418,7 @@ static void build_wedge_inter_predictor_from_buf(MACROBLOCKD *xd, int plane,
mi->mbmi.interinter_wedge_index, mi->mbmi.interinter_wedge_index,
mi->mbmi.interinter_wedge_sign, mi->mbmi.interinter_wedge_sign,
mi->mbmi.sb_type, mi->mbmi.sb_type,
wedge_offset_x, wedge_offset_y, h, w, xd->cur_buf->bit_depth); wedge_offset_x, wedge_offset_y, h, w, xd->bd);
} else { } else {
build_masked_compound_wedge_extend( build_masked_compound_wedge_extend(
dst, dst_buf->stride, tmp_dst, MAX_SB_SIZE, dst, dst_buf->stride, tmp_dst, MAX_SB_SIZE,
@@ -2443,7 +2443,7 @@ static void build_wedge_inter_predictor_from_buf(MACROBLOCKD *xd, int plane,
mi->mbmi.interinter_wedge_index, mi->mbmi.interinter_wedge_index,
mi->mbmi.interinter_wedge_sign, mi->mbmi.interinter_wedge_sign,
mi->mbmi.sb_type, h, w, mi->mbmi.sb_type, h, w,
xd->cur_buf->bit_depth); xd->bd);
else else
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
build_masked_compound_wedge(dst, dst_buf->stride, tmp_dst, MAX_SB_SIZE, build_masked_compound_wedge(dst, dst_buf->stride, tmp_dst, MAX_SB_SIZE,