diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-09 15:26:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-09 15:26:51 -0700 |
| commit | cd0629fe68d96cefb61ee1eaacb11effe0d175e1 (patch) | |
| tree | 3af51f9f8e790ddb6dd1e06edd56a4cf4f1d6351 | |
| parent | ff7df102d996a22f4aabd458b7b9e75d1c20dc09 (diff) | |
| parent | 61c33d0ad5cf633fe14f5ad23dbc9151f74504a8 (diff) | |
| download | libvpx-cd0629fe68d96cefb61ee1eaacb11effe0d175e1.tar libvpx-cd0629fe68d96cefb61ee1eaacb11effe0d175e1.tar.gz libvpx-cd0629fe68d96cefb61ee1eaacb11effe0d175e1.tar.bz2 libvpx-cd0629fe68d96cefb61ee1eaacb11effe0d175e1.zip | |
Merge "Removing plane_block_{width, height}_log2by4 functions."
| -rw-r--r-- | vp9/common/vp9_blockd.h | 10 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 9496c74e9..0f4d3aa19 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -410,16 +410,6 @@ static INLINE int plane_block_height(BLOCK_SIZE_TYPE bsize, return 4 << (b_height_log2(bsize) - plane->subsampling_y); } -static INLINE int plane_block_width_log2by4( - BLOCK_SIZE_TYPE bsize, const struct macroblockd_plane* plane) { - return (b_width_log2(bsize) - plane->subsampling_x); -} - -static INLINE int plane_block_height_log2by4( - BLOCK_SIZE_TYPE bsize, const struct macroblockd_plane* plane) { - return (b_height_log2(bsize) - plane->subsampling_y); -} - typedef void (*foreach_transformed_block_visitor)(int plane, int block, BLOCK_SIZE_TYPE bsize, int ss_txfrm_size, diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index f43a28137..a43c35733 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -459,10 +459,10 @@ void xform_quant(int plane, int block, BLOCK_SIZE_TYPE bsize, int16_t *coeff = BLOCK_OFFSET(p->coeff, block, 16); int16_t *qcoeff = BLOCK_OFFSET(pd->qcoeff, block, 16); int16_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block, 16); - const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size / 2); const int16_t *scan, *iscan; uint16_t *eob = &pd->eobs[block]; - const int bwl = plane_block_width_log2by4(bsize, pd), bw = 1 << bwl; + const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size / 2); + const int bwl = b_width_log2(bsize) - pd->subsampling_x, bw = 1 << bwl; const int twl = bwl - tx_size, twmask = (1 << twl) - 1; int xoff, yoff; int16_t *src_diff; |