Additional logging and disable speed feature for b:457951958 Add additional logging in av1_update_state(), and disable a speed feature used in rd_use_partition(), for variance_partitioning in realtmode, as speculative fix to the issue. Bug: b:457951958 Change-Id: I61a7c8da1ebb87d3db0672b021c58cdf45d3f000
diff --git a/av1/encoder/encodeframe_utils.c b/av1/encoder/encodeframe_utils.c index a509d8e..0dc7ef7 100644 --- a/av1/encoder/encodeframe_utils.c +++ b/av1/encoder/encodeframe_utils.c
@@ -185,11 +185,17 @@ struct macroblock_plane *const p = x->plane; struct macroblockd_plane *const pd = xd->plane; const MB_MODE_INFO *const mi = &ctx->mic; + if (ctx == NULL) { + aom_internal_error(cm->error, AOM_CODEC_ERROR, + "ctx is NULL in av1_update_state: %d %d %d %d %d %d \n", + cm->current_frame.frame_type, cm->width, cm->height, + mi_col, mi_row, bsize); + } if (mi == NULL) { aom_internal_error(cm->error, AOM_CODEC_ERROR, - "mi is NULL in av1_update_state: %d %d %d %d \n", + "mi is NULL in av1_update_state: %d %d %d %d %d %d \n", cm->current_frame.frame_type, cm->width, cm->height, - bsize); + mi_col, mi_row, bsize); } MB_MODE_INFO *const mi_addr = xd->mi[0]; const struct segmentation *const seg = &cm->seg;
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c index 05e1718..bc0e198 100644 --- a/av1/encoder/speed_features.c +++ b/av1/encoder/speed_features.c
@@ -2816,11 +2816,8 @@ if (cpi->oxcf.mode == REALTIME) { if (speed >= 6) { - const int qindex_thresh = boosted ? 190 : (is_720p_or_larger ? 120 : 150); - sf->part_sf.adjust_var_based_rd_partitioning = - frame_is_intra_only(cm) - ? 0 - : cm->quant_params.base_qindex > qindex_thresh; + // Disable this as speculative fix to issue: 457951958. + sf->part_sf.adjust_var_based_rd_partitioning = 0; } return; }