diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-05-03 10:24:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-03 17:19:13 -0700 |
| commit | acc9c125dd632b5c6651b7330cb8eec9272a796b (patch) | |
| tree | 4f7912d47ff3237b71680f27972313ca2ae870b8 /vp9/common | |
| parent | 6c622e2783143c0f50558fc452297ae98d81cc20 (diff) | |
| download | libvpx-acc9c125dd632b5c6651b7330cb8eec9272a796b.tar libvpx-acc9c125dd632b5c6651b7330cb8eec9272a796b.tar.gz libvpx-acc9c125dd632b5c6651b7330cb8eec9272a796b.tar.bz2 libvpx-acc9c125dd632b5c6651b7330cb8eec9272a796b.zip | |
Remove old_block_idx_4x4
Removes several instances where the old block numbering was
still in use.
Change-Id: Id35130591455a4abe6844613e45c0b70c1220c08
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 7d323eed1..a8b563c61 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -885,24 +885,6 @@ static INLINE struct plane_block_idx plane_block_idx(int y_blocks, return res; } -/* TODO(jkoleszar): Probably best to remove instances that require this, - * as the data likely becomes per-plane and stored in the per-plane structures. - * This is a stub to work with the existing code. - */ -static INLINE int old_block_idx_4x4(MACROBLOCKD* const xd, int block_size_b, - int plane, int i) { - const int luma_blocks = 1 << block_size_b; - assert(xd->plane[0].subsampling_x == 0); - assert(xd->plane[0].subsampling_y == 0); - assert(xd->plane[1].subsampling_x == 1); - assert(xd->plane[1].subsampling_y == 1); - assert(xd->plane[2].subsampling_x == 1); - assert(xd->plane[2].subsampling_y == 1); - return plane == 0 ? i : - plane == 1 ? luma_blocks + i : - luma_blocks * 5 / 4 + i; -} - typedef void (*foreach_transformed_block_visitor)(int plane, int block, BLOCK_SIZE_TYPE bsize, int ss_txfrm_size, |