commit 42a875ffe3721d5e90232cac7579086c68abe3b5
author Cheng Chen <chengchen@google.com> Tue May 25 12:21:31 2021 -0700
committer Cheng Chen <chengchen@google.com> Fri May 28 05:22:42 2021 +0000
tree d37feead662a8aaa8b091c8b6c61960d789740b5
parent ae8a2a63cb840c4ffc8869d5f1a1143b89200aad

Remove a function that disrespect the partition decision

This function ignores previous partition decision for partition none.
BUG=aomedia:3068

Change-Id: Id48c575b1b685d3ce977a85c588966f85bb7d620

av1/encoder/partition_search.c

diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c
index ef2f987..897d9ad 100644
--- a/av1/encoder/partition_search.c
+++ b/av1/encoder/partition_search.c
@@ -3256,21 +3256,6 @@
                                      part4_search_allowed);
 }
 
-// Set PARTITION_NONE allowed flag.
-static AOM_INLINE void set_part_none_allowed_flag(
-    AV1_COMP *const cpi, PartitionSearchState *part_search_state) {
-  PartitionBlkParams blk_params = part_search_state->part_blk_params;
-  if ((blk_params.width <= blk_params.min_partition_size_1d) &&
-      blk_params.has_rows && blk_params.has_cols)
-    part_search_state->partition_none_allowed = 1;
-  assert(part_search_state->terminate_partition_search == 0);
-
-  // Set PARTITION_NONE for screen content.
-  if (cpi->use_screen_content_tools)
-    part_search_state->partition_none_allowed =
-        blk_params.has_rows && blk_params.has_cols;
-}
-
 // Set params needed for PARTITION_NONE search.
 static void set_none_partition_params(const AV1_COMP *const cpi, ThreadData *td,
                                       MACROBLOCK *x, PC_TREE *pc_tree,
@@ -3428,7 +3413,6 @@
   assert(bsize < BLOCK_SIZES_ALL);
 
   // Set PARTITION_NONE allowed flag.
-  set_part_none_allowed_flag(cpi, part_search_state);
   if (!part_search_state->partition_none_allowed) return;
 
   int pt_cost = 0;