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 | |
| 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')
| -rw-r--r-- | vp9/common/vp9_common_data.c | 7 | ||||
| -rw-r--r-- | vp9/common/vp9_common_data.h | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 3 |
3 files changed, 10 insertions, 1 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 diff --git a/vp9/common/vp9_common_data.h b/vp9/common/vp9_common_data.h index f41962747..a06c9bed8 100644 --- a/vp9/common/vp9_common_data.h +++ b/vp9/common/vp9_common_data.h @@ -29,6 +29,7 @@ extern const int num_pels_log2_lookup[BLOCK_SIZES]; extern const PARTITION_TYPE partition_lookup[][BLOCK_SIZES]; extern const BLOCK_SIZE subsize_lookup[PARTITION_TYPES][BLOCK_SIZES]; extern const TX_SIZE max_txsize_lookup[BLOCK_SIZES]; +extern const BLOCK_SIZE txsize_to_bsize[TX_SIZES]; extern const TX_SIZE tx_mode_to_biggest_tx_size[TX_MODES]; extern const BLOCK_SIZE ss_size_lookup[BLOCK_SIZES][2][2]; diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 4b3f4f5a0..99f4897f4 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -675,6 +675,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, int i, j; const int width = num_4x4_blocks_wide_lookup[bsize]; const int height = num_4x4_blocks_high_lookup[bsize]; + const BLOCK_SIZE bsize_tx = txsize_to_bsize[mbmi->tx_size]; int rate2 = 0; int64_t dist2 = 0; @@ -700,7 +701,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, src_stride, &pd->dst.buf[4 * (j * dst_stride + i)], dst_stride, i, j, 0); - model_rd_for_sb_y(cpi, bsize, x, xd, &rate, &dist, &var_y, &sse_y); + model_rd_for_sb_y(cpi, bsize_tx, x, xd, &rate, &dist, &var_y, &sse_y); rate2 += rate; dist2 += dist; ++block_idx; |