diff options
| author | Jingning Han <jingning@google.com> | 2014-07-13 11:07:44 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-13 11:07:44 -0700 |
| commit | 6ce515b9ff9000740bc47bb2dfa1b80df6ec2fc9 (patch) | |
| tree | f06d034d6133e4672173eebb6d93a13d0e63898f /vp9/common/vp9_common_data.c | |
| parent | 44eb577cf767357bb34fdf4e49461c9418271dde (diff) | |
| parent | 3cddd81c6d7c0f11114cf73f25f3fadb3e46a59d (diff) | |
| download | libvpx-6ce515b9ff9000740bc47bb2dfa1b80df6ec2fc9.tar libvpx-6ce515b9ff9000740bc47bb2dfa1b80df6ec2fc9.tar.gz libvpx-6ce515b9ff9000740bc47bb2dfa1b80df6ec2fc9.tar.bz2 libvpx-6ce515b9ff9000740bc47bb2dfa1b80df6ec2fc9.zip | |
Merge "Fix chrome valgrind warning due to the use of mismatched bsize"
Diffstat (limited to 'vp9/common/vp9_common_data.c')
| -rw-r--r-- | vp9/common/vp9_common_data.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vp9/common/vp9_common_data.c b/vp9/common/vp9_common_data.c index a927823e0..d4c1b7124 100644 --- a/vp9/common/vp9_common_data.c +++ b/vp9/common/vp9_common_data.c @@ -107,6 +107,13 @@ const TX_SIZE max_txsize_lookup[BLOCK_SIZES] = { TX_32X32, TX_32X32, TX_32X32, TX_32X32 }; +const BLOCK_SIZE txsize_to_bsize[TX_SIZES] = { + BLOCK_4X4, // TX_4X4 + BLOCK_8X8, // TX_8X8 + BLOCK_16X16, // TX_16X16 + BLOCK_32X32, // TX_32X32 +}; + const TX_SIZE tx_mode_to_biggest_tx_size[TX_MODES] = { TX_4X4, // ONLY_4X4 TX_8X8, // ALLOW_8X8 |