generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor PC_TREE root handling.

Browse Source 
Change-Id: Id8b16c1b18bd6f909e72aae3fd582dd3503c88c6
This commit is contained in:
Geza Lore
2016-04-08 15:15:06 +01:00
parent 454989ff32
commit f2be4f6058
5 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vp10/common/enums.h
View File

@@ -20,7 +20,7 @@ extern "C" {
#undef MAX_SB_SIZE #undef MAX_SB_SIZE
// Pixels per max superblock size // Max superblock size
#if CONFIG_EXT_PARTITION #if CONFIG_EXT_PARTITION
# define MAX_SB_SIZE_LOG2 7 # define MAX_SB_SIZE_LOG2 7
#else #else
@@ -29,6 +29,9 @@ extern "C" {
#define MAX_SB_SIZE (1 << MAX_SB_SIZE_LOG2) #define MAX_SB_SIZE (1 << MAX_SB_SIZE_LOG2)
#define MAX_SB_SQUARE (MAX_SB_SIZE * MAX_SB_SIZE) #define MAX_SB_SQUARE (MAX_SB_SIZE * MAX_SB_SIZE)
// Min superblock size
#define MIN_SB_SIZE_LOG2 6
// Pixels per Mode Info (MI) unit // Pixels per Mode Info (MI) unit
#define MI_SIZE_LOG2 3 #define MI_SIZE_LOG2 3
#define MI_SIZE (1 << MI_SIZE_LOG2) #define MI_SIZE (1 << MI_SIZE_LOG2)
@@ -37,6 +40,9 @@ extern "C" {
#define MAX_MIB_SIZE_LOG2 (MAX_SB_SIZE_LOG2 - MI_SIZE_LOG2) #define MAX_MIB_SIZE_LOG2 (MAX_SB_SIZE_LOG2 - MI_SIZE_LOG2)
#define MAX_MIB_SIZE (1 << MAX_MIB_SIZE_LOG2) #define MAX_MIB_SIZE (1 << MAX_MIB_SIZE_LOG2)
// MI-units per min superblock
#define MIN_MIB_SIZE_LOG2 (MIN_SB_SIZE_LOG2 - MI_SIZE_LOG2)
// Mask to extract MI offset within max MIB // Mask to extract MI offset within max MIB
#define MAX_MIB_MASK (MAX_MIB_SIZE - 1) #define MAX_MIB_MASK (MAX_MIB_SIZE - 1)
#define MAX_MIB_MASK_2 (MAX_MIB_SIZE * 2 - 1) #define MAX_MIB_MASK_2 (MAX_MIB_SIZE * 2 - 1)

12
vp10/encoder/context_tree.c
View File

@@ -244,8 +244,16 @@ void vp10_setup_pc_tree(VP10_COMMON *cm, ThreadData *td) {
} }
++square_index; ++square_index;
} }
td->pc_root = &td->pc_tree[tree_nodes - 1];
td->pc_root[0].none.best_mode_index = 2; // Set up the root node for the largest superblock size
i = MAX_MIB_SIZE_LOG2 - MIN_MIB_SIZE_LOG2;
td->pc_root[i] = &td->pc_tree[tree_nodes - 1];
td->pc_root[i]->none.best_mode_index = 2;
// Set up the root nodes for the rest of the possible superblock sizes
while (--i >= 0) {
td->pc_root[i] = td->pc_root[i+1]->split[0];
td->pc_root[i]->none.best_mode_index = 2;
}
} }
void vp10_free_pc_tree(ThreadData *td) { void vp10_free_pc_tree(ThreadData *td) {

13
vp10/encoder/encodeframe.c
View File

@@ -4235,6 +4235,7 @@ static void encode_rd_sb_row(VP10_COMP *cpi,
const int idx_str = cm->mi_stride * mi_row + mi_col; const int idx_str = cm->mi_stride * mi_row + mi_col;
MODE_INFO **mi = cm->mi_grid_visible + idx_str; MODE_INFO **mi = cm->mi_grid_visible + idx_str;
PC_TREE *const pc_root = td->pc_root[cm->mib_size_log2 - MIN_MIB_SIZE_LOG2];
if (sf->adaptive_pred_interp_filter) { if (sf->adaptive_pred_interp_filter) {
for (i = 0; i < leaf_nodes; ++i) for (i = 0; i < leaf_nodes; ++i)
@@ -4249,7 +4250,7 @@ static void encode_rd_sb_row(VP10_COMP *cpi,
} }
vp10_zero(x->pred_mv); vp10_zero(x->pred_mv);
td->pc_root->index = 0; pc_root->index = 0;
if (seg->enabled) { if (seg->enabled) {
const uint8_t *const map = seg->update_map ? cpi->segmentation_map const uint8_t *const map = seg->update_map ? cpi->segmentation_map
@@ -4269,7 +4270,7 @@ static void encode_rd_sb_row(VP10_COMP *cpi,
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
&dummy_rate_nocoef, &dummy_rate_nocoef,
#endif // CONFIG_SUPERTX #endif // CONFIG_SUPERTX
1, td->pc_root); 1, pc_root);
} else if (cpi->partition_search_skippable_frame) { } else if (cpi->partition_search_skippable_frame) {
BLOCK_SIZE bsize; BLOCK_SIZE bsize;
set_offsets(cpi, tile_info, x, mi_row, mi_col, cm->sb_size); set_offsets(cpi, tile_info, x, mi_row, mi_col, cm->sb_size);
@@ -4280,7 +4281,7 @@ static void encode_rd_sb_row(VP10_COMP *cpi,
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
&dummy_rate_nocoef, &dummy_rate_nocoef,
#endif // CONFIG_SUPERTX #endif // CONFIG_SUPERTX
1, td->pc_root); 1, pc_root);
} else if (sf->partition_search_type == VAR_BASED_PARTITION && } else if (sf->partition_search_type == VAR_BASED_PARTITION &&
cm->frame_type != KEY_FRAME) { cm->frame_type != KEY_FRAME) {
choose_partitioning(cpi, tile_info, x, mi_row, mi_col); choose_partitioning(cpi, tile_info, x, mi_row, mi_col);
@@ -4289,7 +4290,7 @@ static void encode_rd_sb_row(VP10_COMP *cpi,
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
&dummy_rate_nocoef, &dummy_rate_nocoef,
#endif // CONFIG_SUPERTX #endif // CONFIG_SUPERTX
1, td->pc_root); 1, pc_root);
} else { } else {
// If required set upper and lower partition size limits // If required set upper and lower partition size limits
if (sf->auto_min_max_partition_size) { if (sf->auto_min_max_partition_size) {
@@ -4303,9 +4304,7 @@ static void encode_rd_sb_row(VP10_COMP *cpi,
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
&dummy_rate_nocoef, &dummy_rate_nocoef,
#endif // CONFIG_SUPERTX #endif // CONFIG_SUPERTX
INT64_MAX, INT64_MAX, pc_root);
cm->sb_size == BLOCK_LARGEST ? td->pc_root
: td->pc_root->split[0]);
} }
} }
#if CONFIG_ENTROPY #if CONFIG_ENTROPY

2
vp10/encoder/encoder.h
View File

@@ -266,7 +266,7 @@ typedef struct ThreadData {
PICK_MODE_CONTEXT *leaf_tree; PICK_MODE_CONTEXT *leaf_tree;
PC_TREE *pc_tree; PC_TREE *pc_tree;
PC_TREE *pc_root; PC_TREE *pc_root[MAX_MIB_SIZE_LOG2 - MIN_MIB_SIZE_LOG2 + 1];
} ThreadData; } ThreadData;
struct EncWorkerData; struct EncWorkerData;

3
vp10/encoder/firstpass.c
View File

@@ -491,7 +491,8 @@ void vp10_first_pass(VP10_COMP *cpi, const struct lookahead_entry *source) {
TileInfo tile; TileInfo tile;
struct macroblock_plane *const p = x->plane; struct macroblock_plane *const p = x->plane;
struct macroblockd_plane *const pd = xd->plane; struct macroblockd_plane *const pd = xd->plane;
const PICK_MODE_CONTEXT *ctx = &cpi->td.pc_root->none; const PICK_MODE_CONTEXT *ctx =
&cpi->td.pc_root[MAX_MIB_SIZE_LOG2 - MIN_MIB_SIZE_LOG2]->none;
int i; int i;
int recon_yoffset, recon_uvoffset; int recon_yoffset, recon_uvoffset;