ref: 623e6eed5e4b1b49c2c73ce0f4d8be6f267e7dbd
parent: 7dbdada49f0d63d18173fa91d9510fc5f17bb21a
parent: 4c1a8be29d51b9e3face742ff145995996a0da20
author: hkuang <[email protected]>
date: Wed May 6 13:29:51 EDT 2015
Merge "Optimize the read_partition."
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -417,20 +417,11 @@
BLOCK_SIZE bsize) {
const PARTITION_CONTEXT *above_ctx = xd->above_seg_context + mi_col;
const PARTITION_CONTEXT *left_ctx = xd->left_seg_context + (mi_row & MI_MASK);
-
const int bsl = mi_width_log2_lookup[bsize];
- const int bs = 1 << bsl;
- int above = 0, left = 0, i;
+ int above = (*above_ctx >> bsl) & 1 , left = (*left_ctx >> bsl) & 1;
assert(b_width_log2_lookup[bsize] == b_height_log2_lookup[bsize]);
assert(bsl >= 0);
-
- for (i = 0; i < bs; i++) {
- above |= above_ctx[i];
- left |= left_ctx[i];
- }
- above = (above & bs) > 0;
- left = (left & bs) > 0;
return (left * 2 + above) + bsl * PARTITION_PLOFFSET;
}