Revert "Extend joint motion search range" Revert submission 122484 STATS_CHANGED Reason for revert: These patches were created for testing. It does not seem like a good trade-off in terms of computation vs. coding-gain. Reverted Changes: Ibf752e7c6:Extend joint motion search range I55faaa020:Enable one-sided motion search to account for join... I9555515db:Allow jnt motion search Change-Id: I1784a043479dcd1874ed00ed1371ac15fd528657
diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c index 5eff5bf..70cfbf7 100644 --- a/av1/encoder/mcomp.c +++ b/av1/encoder/mcomp.c
@@ -1627,6 +1627,10 @@ MARK_MV_INVALID(second_best_mv); } + assert(ms_params->ms_buffers.second_pred == NULL && + ms_params->ms_buffers.mask == NULL && + "av1_full_pixel_search does not support compound pred"); + if (cost_list) { cost_list[0] = INT_MAX; cost_list[1] = INT_MAX;