rtc: Disable top_right_sync_wait_in_mis
Disabled the speed feature top_right_sync_wait_in_mis and
reverted a change in direct_partition_merging() to fix
encode/decode mismatch on the RTC 1080P set.
Change-Id: I580c608a67a6f08880d46dc51fcabd87c78d65cb
diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c
index d704bb4..af7229a 100644
--- a/av1/encoder/partition_search.c
+++ b/av1/encoder/partition_search.c
@@ -2597,15 +2597,7 @@
// Update mi for this partition block.
for (int y = 0; y < bs; y++) {
for (int x_idx = 0; x_idx < bs; x_idx++) {
- this_mi[x_idx + y * mi_params->mi_stride]->bsize = this_mi[0]->bsize;
- this_mi[x_idx + y * mi_params->mi_stride]->partition =
- this_mi[0]->partition;
- this_mi[x_idx + y * mi_params->mi_stride]->skip_txfm =
- this_mi[0]->skip_txfm;
- this_mi[x_idx + y * mi_params->mi_stride]->tx_size =
- this_mi[0]->tx_size;
- memcpy(this_mi[x_idx + y * mi_params->mi_stride]->inter_tx_size,
- this_mi[0]->inter_tx_size, sizeof(this_mi[0]->inter_tx_size));
+ this_mi[x_idx + y * mi_params->mi_stride] = this_mi[0];
}
}
}
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 820e6b5..47e6cf6 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -1727,10 +1727,9 @@
// For multi-thread use case with row_mt enabled, enable top right
// dependency wait of threads at mi level.
if ((cpi->oxcf.row_mt == 1) && (cpi->mt_info.num_workers > 1)) {
- sf->rt_sf.top_right_sync_wait_in_mis =
- frame_is_intra_only(cm) ? 0
- : (!cpi->oxcf.tool_cfg.enable_global_motion &&
- cpi->sf.rt_sf.use_nonrd_pick_mode);
+ // TODO(Deepa): Disabled this feature due to enc/dec mismatch
+ // seen on the RTC 1080P set. Need to re-enable it after the fix.
+ sf->rt_sf.top_right_sync_wait_in_mis = false;
}
}
if (speed >= 10) {
