commit faba87e9e02b0636e60ad29cdaf05a9668af48e4
author Chi Yo Tsai <chiyotsai@google.com> Tue Nov 15 00:54:27 2022 +0000
committer Chi Yo Tsai <chiyotsai@google.com> Tue Nov 15 00:54:27 2022 +0000
tree 7493f1cd1ebf93e331ba9905fb1ec561fe440269
parent 5d6ea0c80acf226b6f34db026cf86309c00c188c

ERP: Fix NONE pruning  with two pass partition search

Change-Id: I808a0999ef57db1926019405e4504138aeafed50

av1/encoder/partition_search.c

diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c
index e2bc7f2..99b01ca 100644
--- a/av1/encoder/partition_search.c
+++ b/av1/encoder/partition_search.c
@@ -4839,7 +4839,8 @@
   int *partition_horz_allowed = &part_search_state.partition_rect_allowed[HORZ];
   int *partition_vert_allowed = &part_search_state.partition_rect_allowed[VERT];
 #if CONFIG_EXT_RECUR_PARTITIONS
-  if (forced_partition == PARTITION_INVALID) {
+  if (forced_partition == PARTITION_INVALID &&
+      is_bsize_gt(bsize, x->sb_enc.min_partition_size)) {
 #endif  // CONFIG_EXT_RECUR_PARTITIONS
     int *prune_horz = &part_search_state.prune_rect_part[HORZ];
     int *prune_vert = &part_search_state.prune_rect_part[VERT];

av1/encoder/partition_strategy.c

diff --git a/av1/encoder/partition_strategy.c b/av1/encoder/partition_strategy.c
index 51d163c..eeffb4f 100644
--- a/av1/encoder/partition_strategy.c
+++ b/av1/encoder/partition_strategy.c
@@ -1368,7 +1368,7 @@
         av1_cache_best_partition(x->sms_bufs, mi_row, mi_col, bsize,
                                  cm->seq_params.sb_size, PARTITION_VERT);
         const int mi_step = block_size_wide[bsize] / 2;
-        BLOCK_SIZE subsize = get_partition_subsize(bsize, PARTITION_HORZ);
+        BLOCK_SIZE subsize = get_partition_subsize(bsize, PARTITION_VERT);
         av1_cache_best_partition(x->sms_bufs, mi_row, mi_col, subsize,
                                  cm->seq_params.sb_size, PARTITION_HORZ);
         av1_cache_best_partition(x->sms_bufs, mi_row, mi_col + mi_step, subsize,