ref: 5826407f2a79f3c68147e9d3bec879b1b62ab09e
parent: 5baf510f74ca2fe82ea5aa547b1330d4c5059581
parent: 569ca37d09d5ae4e6eb47f110cc33805a09df7af
author: Dmitry Kovalev <[email protected]>
date: Tue Aug 20 06:06:22 EDT 2013
Merge "Moving plane_block_idx from vp9_blockd.h to vp9_quantize.c."
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -366,32 +366,6 @@
return MIN(mbmi->txfm_size, max_uv_txsize_lookup[mbmi->sb_type]);
}
-struct plane_block_idx {- int plane;
- int block;
-};
-
-// TODO(jkoleszar): returning a struct so it can be used in a const context,
-// expect to refactor this further later.
-static INLINE struct plane_block_idx plane_block_idx(int y_blocks,
- int b_idx) {- const int v_offset = y_blocks * 5 / 4;
- struct plane_block_idx res;
-
- if (b_idx < y_blocks) {- res.plane = 0;
- res.block = b_idx;
- } else if (b_idx < v_offset) {- res.plane = 1;
- res.block = b_idx - y_blocks;
- } else {- assert(b_idx < y_blocks * 3 / 2);
- res.plane = 2;
- res.block = b_idx - v_offset;
- }
- return res;
-}
-
static BLOCK_SIZE_TYPE get_plane_block_size(BLOCK_SIZE_TYPE bsize,
const struct macroblockd_plane *pd) {BLOCK_SIZE_TYPE bs = ss_size_lookup[bsize]
--- a/vp9/encoder/vp9_quantize.c
+++ b/vp9/encoder/vp9_quantize.c
@@ -152,6 +152,32 @@
*eob_ptr = eob + 1;
}
+struct plane_block_idx {+ int plane;
+ int block;
+};
+
+// TODO(jkoleszar): returning a struct so it can be used in a const context,
+// expect to refactor this further later.
+static INLINE struct plane_block_idx plane_block_idx(int y_blocks,
+ int b_idx) {+ const int v_offset = y_blocks * 5 / 4;
+ struct plane_block_idx res;
+
+ if (b_idx < y_blocks) {+ res.plane = 0;
+ res.block = b_idx;
+ } else if (b_idx < v_offset) {+ res.plane = 1;
+ res.block = b_idx - y_blocks;
+ } else {+ assert(b_idx < y_blocks * 3 / 2);
+ res.plane = 2;
+ res.block = b_idx - v_offset;
+ }
+ return res;
+}
+
void vp9_regular_quantize_b_4x4(MACROBLOCK *mb, int b_idx, TX_TYPE tx_type,
int y_blocks) {MACROBLOCKD *const xd = &mb->e_mbd;