Commit c1c6f6a2 authored by Yaowu Xu's avatar Yaowu Xu
Browse files

Merge aom/master and webm/nextgenv2

Change-Id: Ic9679c0551f809807bd5c1196c302b072e7fa613
parents 6515afc6 8b0f6368
......@@ -7854,7 +7854,7 @@ static int64_t handle_inter_mode(
rdcosty = RDCOST(x->rdmult, x->rddiv, *rate2, *distortion);
rdcosty = AOMMIN(rdcosty, RDCOST(x->rdmult, x->rddiv, 0, *psse));
/* clang-format off */
#if CONFIG_VAR_TX
is_cost_valid_uv =
inter_block_uvrd(cpi, x, &rd_stats_uv, bsize, ref_best_rd - rdcosty);
......@@ -7881,7 +7881,7 @@ static int64_t handle_inter_mode(
return INT64_MAX;
#endif // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
}
/* clang-format on */
*psse += sseuv;
*rate2 += *rate_uv;
*distortion += distortion_uv;
......
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