diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-08-13 09:36:53 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2015-08-13 09:58:26 -0700 |
| commit | fc7cbd1f606c7746d9444d18e487cac27ee98212 (patch) | |
| tree | e3e1875d8c4b6c9587486e16486142a8a8dcfe4b /vp10/encoder/context_tree.c | |
| parent | 2dcefd9c7fdc08f28f8276f2a41df453c1f0a020 (diff) | |
| download | libvpx-fc7cbd1f606c7746d9444d18e487cac27ee98212.tar libvpx-fc7cbd1f606c7746d9444d18e487cac27ee98212.tar.gz libvpx-fc7cbd1f606c7746d9444d18e487cac27ee98212.tar.bz2 libvpx-fc7cbd1f606c7746d9444d18e487cac27ee98212.zip | |
VP9_COMMON -> VP10->COMMON
Change-Id: I651b7bee90f33581368853da81f9622805ccc0ea
Diffstat (limited to 'vp10/encoder/context_tree.c')
| -rw-r--r-- | vp10/encoder/context_tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp10/encoder/context_tree.c b/vp10/encoder/context_tree.c index 11a7bb3ac..d210e3610 100644 --- a/vp10/encoder/context_tree.c +++ b/vp10/encoder/context_tree.c @@ -18,7 +18,7 @@ static const BLOCK_SIZE square[] = { BLOCK_64X64, }; -static void alloc_mode_context(VP9_COMMON *cm, int num_4x4_blk, +static void alloc_mode_context(VP10_COMMON *cm, int num_4x4_blk, PICK_MODE_CONTEXT *ctx) { const int num_blk = (num_4x4_blk < 4 ? 4 : num_4x4_blk); const int num_pix = num_blk << 4; @@ -63,7 +63,7 @@ static void free_mode_context(PICK_MODE_CONTEXT *ctx) { } } -static void alloc_tree_contexts(VP9_COMMON *cm, PC_TREE *tree, +static void alloc_tree_contexts(VP10_COMMON *cm, PC_TREE *tree, int num_4x4_blk) { alloc_mode_context(cm, num_4x4_blk, &tree->none); alloc_mode_context(cm, num_4x4_blk/2, &tree->horizontal[0]); @@ -90,7 +90,7 @@ static void free_tree_contexts(PC_TREE *tree) { // partition level. There are contexts for none, horizontal, vertical, and // split. Along with a block_size value and a selected block_size which // represents the state of our search. -void vp10_setup_pc_tree(VP9_COMMON *cm, ThreadData *td) { +void vp10_setup_pc_tree(VP10_COMMON *cm, ThreadData *td) { int i, j; const int leaf_nodes = 64; const int tree_nodes = 64 + 16 + 4 + 1; |