Commit 58bc4cc0 authored by Jingning Han's avatar Jingning Han

Support ext-partition in cb4x4 mode

This commit resolves the coding pipeline breakage when ext-partition
and cb4x4 are both enabled.

BUG=aomedia:138

Change-Id: Ic17da68af80d7a66565b0e1c69b895be27282a9a
parent 6f345c6a
This diff is collapsed.
......@@ -202,7 +202,11 @@ void av1_setup_pc_tree(AV1_COMMON *cm, ThreadData *td) {
// TODO(jingning): The pc_tree allocation is redundant. We can take out all
// the leaf nodes after cb4x4 mode is enabled.
#if CONFIG_CB4X4
#if CONFIG_EXT_PARTITION
const int tree_nodes_inc = 1024;
#else
const int tree_nodes_inc = 256;
#endif // CONFIG_EXT_PARTITION
const int leaf_factor = 4;
#else
const int tree_nodes_inc = 0;
......@@ -284,7 +288,11 @@ void av1_setup_pc_tree(AV1_COMMON *cm, ThreadData *td) {
void av1_free_pc_tree(ThreadData *td) {
#if CONFIG_CB4X4
#if CONFIG_EXT_PARTITION
const int tree_nodes_inc = 1024;
#else
const int tree_nodes_inc = 256;
#endif // CONFIG_EXT_PARTITION
const int leaf_factor = 4;
#else
const int tree_nodes_inc = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment