Commit 83d490c8 authored by Debargha Mukherjee's avatar Debargha Mukherjee Committed by Yaowu Xu
Browse files

Fix mismatch w/ dual_filter and global/warped

Set all 4 interpolation filters in cases where global and warped
motion is used and no interpolation filter is sent.

Change-Id: I17ab74daabcd6a531b72826903a02f2de7caf7b2
parent ce8275ce
...@@ -1341,10 +1341,11 @@ static INLINE void read_mb_interp_filter(AV1_COMMON *const cm, ...@@ -1341,10 +1341,11 @@ static INLINE void read_mb_interp_filter(AV1_COMMON *const cm,
#if CONFIG_GLOBAL_MOTION #if CONFIG_GLOBAL_MOTION
if (is_nontrans_global_motion(xd)) { if (is_nontrans_global_motion(xd)) {
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
mbmi->interp_filter[0] = int dir;
cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR : cm->interp_filter; for (dir = 0; dir < 4; ++dir)
mbmi->interp_filter[1] = mbmi->interp_filter[dir] = cm->interp_filter == SWITCHABLE
cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR : cm->interp_filter; ? EIGHTTAP_REGULAR
: cm->interp_filter;
#else #else
mbmi->interp_filter = mbmi->interp_filter =
cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR : cm->interp_filter; cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR : cm->interp_filter;
...@@ -2256,10 +2257,11 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi, ...@@ -2256,10 +2257,11 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
#if CONFIG_WARPED_MOTION #if CONFIG_WARPED_MOTION
} else { } else {
#if CONFIG_DUAL_FILTER #if CONFIG_DUAL_FILTER
mbmi->interp_filter[0] = int dir;
cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR : cm->interp_filter; for (dir = 0; dir < 4; ++dir)
mbmi->interp_filter[1] = mbmi->interp_filter[dir] = cm->interp_filter == SWITCHABLE
cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR : cm->interp_filter; ? EIGHTTAP_REGULAR
: cm->interp_filter;
#else #else
mbmi->interp_filter = mbmi->interp_filter =
cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR : cm->interp_filter; cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR : cm->interp_filter;
......
Supports Markdown
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