diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
| commit | ec910d81405c736a4490383a250299a7837c2e64 (patch) | |
| tree | 4f27cc226f93a863121aef6c56313e4153a69b3e /third_party/aom/av1/encoder/context_tree.h | |
| parent | 01eb57073ba97b2d6cbf20f745dfcc508197adc3 (diff) | |
| download | UXP-ec910d81405c736a4490383a250299a7837c2e64.tar UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.gz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.lz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.xz UXP-ec910d81405c736a4490383a250299a7837c2e64.zip | |
Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614
Diffstat (limited to 'third_party/aom/av1/encoder/context_tree.h')
| -rw-r--r-- | third_party/aom/av1/encoder/context_tree.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/aom/av1/encoder/context_tree.h b/third_party/aom/av1/encoder/context_tree.h index bcfcc274a..38052ba27 100644 --- a/third_party/aom/av1/encoder/context_tree.h +++ b/third_party/aom/av1/encoder/context_tree.h @@ -27,9 +27,10 @@ struct ThreadData; typedef struct { MODE_INFO mic; MB_MODE_INFO_EXT mbmi_ext; -#if CONFIG_PALETTE uint8_t *color_index_map[2]; -#endif // CONFIG_PALETTE +#if CONFIG_MRC_TX + uint8_t *mrc_mask; +#endif // CONFIG_MRC_TX #if CONFIG_VAR_TX uint8_t *blk_skip[MAX_MB_PLANE]; #endif @@ -84,6 +85,7 @@ typedef struct PC_TREE { PICK_MODE_CONTEXT horizontal4[4]; PICK_MODE_CONTEXT vertical4[4]; #endif + // TODO(jingning): remove leaf_split[] when cb4x4 experiment flag is removed. union { struct PC_TREE *split[4]; PICK_MODE_CONTEXT *leaf_split[4]; |