ref: 6b02a123bc0025c85d5ba110848f65f1e9fb2442
parent: 5bd279db7c5f027caf033b8650c43cb66f14cf56
parent: 797ec1cd66c04fd335adba8ecc01dc93eab1898e
author: Yunqing Wang <yunqingwang@google.com>
date: Fri Jan 11 17:53:31 EST 2019
Merge "Fix segmentation fault in hbd path"
--- a/vp9/encoder/vp9_temporal_filter.c
+++ b/vp9/encoder/vp9_temporal_filter.c
@@ -110,11 +110,16 @@
CONVERT_TO_SHORTPTR(y_mb_ptr + y_offset), stride,
CONVERT_TO_SHORTPTR(&pred[p_offset]), BW, &mv, scale, xs, ys,
which_mv, kernel, MV_PRECISION_Q3, x, y, xd->bd);
+ } else {+ vp9_build_inter_predictor(y_mb_ptr + y_offset, stride, &pred[p_offset],
+ BW, &mv, scale, xs, ys, which_mv, kernel,
+ MV_PRECISION_Q3, x, y);
}
-#endif // CONFIG_VP9_HIGHBITDEPTH
+#else
vp9_build_inter_predictor(y_mb_ptr + y_offset, stride, &pred[p_offset],
BW, &mv, scale, xs, ys, which_mv, kernel,
MV_PRECISION_Q3, x, y);
+#endif // CONFIG_VP9_HIGHBITDEPTH
k++;
}
}
@@ -143,8 +148,18 @@
CONVERT_TO_SHORTPTR(&pred[(BLK_PELS << 1) + p_offset]),
uv_block_width, &mv, scale, xs, ys, which_mv, kernel,
mv_precision_uv, x, y, xd->bd);
+ } else {+ vp9_build_inter_predictor(u_mb_ptr + uv_offset, uv_stride,
+ &pred[BLK_PELS + p_offset], uv_block_width,
+ &mv, scale, xs, ys, which_mv, kernel,
+ mv_precision_uv, x, y);
+
+ vp9_build_inter_predictor(v_mb_ptr + uv_offset, uv_stride,
+ &pred[(BLK_PELS << 1) + p_offset],
+ uv_block_width, &mv, scale, xs, ys, which_mv,
+ kernel, mv_precision_uv, x, y);
}
-#endif // CONFIG_VP9_HIGHBITDEPTH
+#else
vp9_build_inter_predictor(u_mb_ptr + uv_offset, uv_stride,
&pred[BLK_PELS + p_offset], uv_block_width, &mv,
scale, xs, ys, which_mv, kernel,
@@ -154,6 +169,7 @@
&pred[(BLK_PELS << 1) + p_offset],
uv_block_width, &mv, scale, xs, ys, which_mv,
kernel, mv_precision_uv, x, y);
+#endif // CONFIG_VP9_HIGHBITDEPTH
k++;
}
}