Fix init tx search depth for large blocks
The bitstream always take max tx size as the first level of tx
partitioning. RDO should follow the same rule in speed 0 to avoid
performance degradation.
Change-Id: I14871cb6bb06027fc15f05a3547d2c0e93e3d877
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index cbe7072..0d98eb3 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2392,12 +2392,8 @@
static int get_search_init_depth(int mi_width, int mi_height,
const SPEED_FEATURES *sf) {
if (sf->tx_size_search_method == USE_LARGESTALL) return MAX_VARTX_DEPTH;
- int init_depth = (mi_height != mi_width) ? sf->tx_size_search_init_depth_rect
- : sf->tx_size_search_init_depth_sqr;
- // If either dimension is 128, search one level less.
- if (mi_width == 32 || mi_height == 32)
- init_depth = AOMMIN(init_depth + 1, MAX_TX_DEPTH);
- return init_depth;
+ return (mi_height != mi_width) ? sf->tx_size_search_init_depth_rect
+ : sf->tx_size_search_init_depth_sqr;
}
static void choose_tx_size_type_from_rd(const AV1_COMP *const cpi,
