Revert "Fix frame parallel encode failure" This reverts commit c2b223c888cd7994356f185f638bacaeb98fc93e. Reason for revert: This is not the cause of the failure. Bug: 487328945 Change-Id: I75cf6eff893d64288e5dfc2cc9268f09ba7e438a
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c index 0905b2b..dde46f6 100644 --- a/av1/encoder/rdopt.c +++ b/av1/encoder/rdopt.c
@@ -6257,13 +6257,6 @@ txfm_info->skip_txfm = 0; sf_args.num_single_modes_processed += is_single_pred; - - const bool optimized_init = !cpi->oxcf.fp_mt; - if (!optimized_init) { - init_mbmi(mbmi, this_mode, ref_frames, cm); - set_ref_ptrs(cm, xd, ref_frame, second_ref_frame); - } - #if CONFIG_COLLECT_COMPONENT_TIMING start_timing(cpi, skip_inter_mode_time); #endif @@ -6275,10 +6268,8 @@ #endif if (is_skip_inter_mode) continue; - if (optimized_init) { - init_mbmi(mbmi, this_mode, ref_frames, cm); - set_ref_ptrs(cm, xd, ref_frame, second_ref_frame); - } + init_mbmi(mbmi, this_mode, ref_frames, cm); + set_ref_ptrs(cm, xd, ref_frame, second_ref_frame); // Select prediction reference frames. for (i = 0; i < num_planes; i++) {