Commit 4b0c932d authored by Grant Hsu's avatar Grant Hsu
Browse files

Fix a bug in handle_inter_mode

The return value is incorrect if joint compound search is early terminated.

STATS_CHANGED

Change-Id: I5911057b098a137be7d67b63abd494341cd53039
parent c7101aa9
main 3gpp-2021-10-15 applejack braeburn celestia daringdo dev electric-sky experimental fluttershy gladmane helia ironbark jellybee karat luna luxoft-speed m102-5005 m104-5112 m105-5195 m106-5249 m108-5359 m109-5414 m110-5481 m111-5563 m114-5737 m120-6099 m125-6422 m126-6478 m69-3497 m70-3538 m72 m90-4430 m93-4577 master minty northstar research research-erp research-in-loop-filters research-partition research-quant research-reference research-transform research2 sandbox/bohanli@google.com/test sandbox/lpartin@google.com/opfl_farneback sandbox/lpartin@google.com/opfl_hornschunck sandbox/lpartin@google.com/opfl_tmpfilt sandbox/mingruiy@google.com/ent_context sandbox/urvang@google.com/seg_pred sandbox/yaoyaogoogle@google.com/360degree sandbox/yunqingwang@google.com/dspl_exp simd-speed 3gpp-2021-10-15 3gpp-2021-10-15-5 3gpp-2021-10-15-4 3gpp-2021-10-15-3 3gpp-2021-10-15-2 v3.12.0 v3.12.0-rc2 v3.12.0-rc1 v3.11.0 v3.11.0-rc1 v3.10.0 v3.10.0-rc2 v3.10.0-rc1 v3.9.1 v3.9.1-rc2 v3.9.1-rc1 v3.9.0 v3.9.0-rc1 v3.8.3 v3.8.3-rc2 v3.8.3-rc1 v3.8.2 v3.8.2-rc1 v3.8.1 v3.8.1-rc1 v3.8.0 v3.8.0-rc1 v3.7.2 v3.7.2-rc1 v3.7.1 v3.7.1-rc1 v3.7.0 v3.7.0-rc3 v3.7.0-rc2 v3.7.0-rc1 v3.6.1 v3.6.1-rc2 v3.6.1-rc1 v3.6.0 v3.6.0-rc3 v3.6.0-rc2 v3.6.0-rc1 v3.5.0 v3.5.0-rc1 v3.4.0 v3.4.0-rc2 v3.4.0-rc1 v3.3.0 v3.3.0-rc2 v3.3.0-rc1 v3.2.0 v3.2.0-rc3 v3.2.0-rc2 v3.2.0-rc1 v3.1.3 v3.1.3-rc2 v3.1.3-rc1 v3.1.2 v3.1.1 v3.1.0 v3.1.0-rc1 v3.0.0 v3.0.0-rc1 v2.1.0-rc1 v2.0.2 v2.0.1 v2.0.0 v2.0.0-rc1 v1.0.0-errata1-avif research-v2.0.0 research-v2.0.0-rc1 research-v1.0.1 research-v1.0.0
No related merge requests found
Showing with 1 addition and 1 deletion
+1 -1
......@@ -8842,12 +8842,12 @@ static int64_t handle_inter_mode(const AV1_COMP *const cpi, MACROBLOCK *x,
*rd_stats = best_rd_stats;
*rd_stats_y = best_rd_stats_y;
*rd_stats_uv = best_rd_stats_uv;
ret_val = best_ret_val;
*mbmi = best_mbmi;
assert(IMPLIES(mbmi->comp_group_idx == 1,
mbmi->interinter_comp.type != COMPOUND_AVERAGE));
memcpy(x->blk_skip, best_blk_skip,
sizeof(best_blk_skip[0]) * xd->n8_h * xd->n8_w);
return RDCOST(x->rdmult, rd_stats->rate, rd_stats->dist);
}
if (early_terminate == INT64_MAX) return INT64_MAX;
if (ret_val != 0) return ret_val;
......
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