commit ce81ffc9df02d92ff2aae793821728c798b70a30
author Cheng Chen <chengchen@google.com> Mon Sep 27 14:37:43 2021 -0700
committer Cheng Chen <chengchen@google.com> Wed Oct 06 18:20:40 2021 +0000
tree b8d20fbe02b7f7b69be306efdc8a11aeb044031a
parent 2b4502922f9130e26feaaf14f04f2d19a2d2c74e

ExtPart: Fix block size assignment

Similar to the function "read_partition_tree".

Change-Id: I23c442a9119884f0a424b89cc6a044dd477922cc

av1/encoder/partition_search.c

diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c
index 8598bb4..bd8a099 100644
--- a/av1/encoder/partition_search.c
+++ b/av1/encoder/partition_search.c
@@ -4134,7 +4134,10 @@
     assert(partitioning >= PARTITION_NONE &&
            partitioning < EXT_PARTITION_TYPES);
     PC_TREE *node = tree_node_queue[q_idx];
-    if (node != NULL) node->partitioning = partitioning;
+    if (node != NULL) {
+      node->partitioning = partitioning;
+      bsize = node->block_size;
+    }
     if (partitioning == PARTITION_SPLIT) {
       const BLOCK_SIZE subsize = get_partition_subsize(bsize, PARTITION_SPLIT);
       for (int i = 0; i < 4; ++i) {
@@ -4145,7 +4148,6 @@
           ++last_idx;
         }
       }
-      bsize = subsize;
     }
     --num_nodes;
     ++q_idx;