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

Fix left shift of negative integer in hbd directional predictors

Browse Source 
Change-Id: Id78139ae2dfa2d521bd50618b4a81cf24e09e391
This commit is contained in:
Alex Converse
2016-10-06 11:36:08 -07:00
parent 29804479b5
commit 24aa59cc51
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
av1/common/reconintra.c
View File

@@ -868,7 +868,7 @@ static void highbd_dr_prediction_z1(uint16_t *dst, ptrdiff_t stride, int bs,
for (c = 0; c < bs; ++c) { for (c = 0; c < bs; ++c) {
x = (c << 8) - y * dx; x = (c << 8) - y * dx;
base = x >> 8; base = x >> 8;
shift = x - (base << 8); shift = x & 0xFF;
if (base < 2 * bs - 1) { if (base < 2 * bs - 1) {
val = highbd_intra_subpel_interp(base, shift, above, 0, 2 * bs - 1, val = highbd_intra_subpel_interp(base, shift, above, 0, 2 * bs - 1,
filter_type); filter_type);
@@ -897,7 +897,7 @@ static void highbd_dr_prediction_z2(uint16_t *dst, ptrdiff_t stride, int bs,
x = (c << 8) - y * dx; x = (c << 8) - y * dx;
base = x >> 8; base = x >> 8;
if (base >= -1) { if (base >= -1) {
shift = x - (base << 8); shift = x & 0xFF;
val = highbd_intra_subpel_interp(base, shift, above, -1, bs - 1, val = highbd_intra_subpel_interp(base, shift, above, -1, bs - 1,
filter_type); filter_type);
} else { } else {
@@ -905,7 +905,7 @@ static void highbd_dr_prediction_z2(uint16_t *dst, ptrdiff_t stride, int bs,
y = (r << 8) - x * dy; y = (r << 8) - x * dy;
base = y >> 8; base = y >> 8;
if (base >= 0) { if (base >= 0) {
shift = y - (base << 8); shift = y & 0xFF;
val = highbd_intra_subpel_interp(base, shift, left, 0, bs - 1, val = highbd_intra_subpel_interp(base, shift, left, 0, bs - 1,
filter_type); filter_type);
} else { } else {
@@ -935,7 +935,7 @@ static void highbd_dr_prediction_z3(uint16_t *dst, ptrdiff_t stride, int bs,
x = c + 1; x = c + 1;
y = (r << 8) - x * dy; y = (r << 8) - x * dy;
base = y >> 8; base = y >> 8;
shift = y - (base << 8); shift = y & 0xFF;
if (base < 2 * bs - 1) { if (base < 2 * bs - 1) {
val = highbd_intra_subpel_interp(base, shift, left, 0, 2 * bs - 1, val = highbd_intra_subpel_interp(base, shift, left, 0, 2 * bs - 1,
filter_type); filter_type);