ref: a4279138642f80fc906d5e2705d1caa0d97046a0
parent: abb66ef0ba3858888a5fc7b7e9cb30b8e61d4859
parent: b8decb0313bf28bf83b4f201808d3128738024b1
author: Jingning Han <jingning@google.com>
date: Wed May 1 16:52:07 EDT 2013
Merge "Fix bugs in sb8x8 experiment/context prob update" into experimental
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -453,7 +453,7 @@
static INLINE void update_partition_context(MACROBLOCKD *xd,
BLOCK_SIZE_TYPE sb_type,
BLOCK_SIZE_TYPE sb_size) {- int bsl = mi_width_log2(sb_size), bs = 1 << bsl;
+ int bsl = mi_width_log2(sb_size), bs;
int bwl = mi_width_log2(sb_type);
int bhl = mi_height_log2(sb_type);
int boffset = mi_width_log2(BLOCK_SIZE_SB64X64) - bsl;
@@ -461,6 +461,12 @@
// skip macroblock partition
if (bsl == 0)
return;
+
+#if CONFIG_SB8X8
+ bs = 1 << (bsl - 1);
+#else
+ bs = 1 << bsl;
+#endif
// update the partition context at the end notes. set partition bits
// of block sizes larger than the current one to be one, and partition
--
⑨