Commit 1b672d3f authored by Zoe Liu's avatar Zoe Liu

Make convolve_round compiled without dual_filter

Change-Id: I532e46b3947ca3f5898a2da61fb6b82c2f4bd5c6
parent 1ba9bd89
......@@ -284,12 +284,15 @@ void av1_convolve_2d_facade(const uint8_t *src, int src_stride, uint8_t *dst,
av1_get_interp_filter_params(interp_filter[1 + 2 * conv_params->ref]);
InterpFilterParams filter_params_y =
av1_get_interp_filter_params(interp_filter[0 + 2 * conv_params->ref]);
#if CONFIG_DUAL_FILTER
if (filter_params_x.interp_filter == MULTITAP_SHARP &&
filter_params_y.interp_filter == MULTITAP_SHARP) {
// Avoid two directions both using 12-tap filter.
// This will reduce hardware implementation cost.
filter_params_y = av1_get_interp_filter_params(EIGHTTAP_SHARP);
}
#endif
if (filter_params_y.taps < filter_params_x.taps) {
uint8_t tr_src[(MAX_SB_SIZE + MAX_FILTER_TAP - 1) *
......
......@@ -74,8 +74,12 @@ static INLINE void inter_predictor(const uint8_t *src, int src_stride,
#if CONFIG_CONVOLVE_ROUND
if (conv_params->round == CONVOLVE_OPT_NO_ROUND)
av1_convolve_2d_facade(src, src_stride, dst, dst_stride, w, h,
interp_filter, subpel_x, xs, subpel_y, ys,
conv_params);
#if CONFIG_DUAL_FILTER
interp_filter,
#else
&interp_filter,
#endif
subpel_x, xs, subpel_y, ys, conv_params);
else
#endif
av1_convolve(src, src_stride, dst, dst_stride, w, h, interp_filter,
......
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