Commit a4279138 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review

Merge "Fix bugs in sb8x8 experiment/context prob update" into experimental

parents abb66ef0 b8decb03
......@@ -453,7 +453,7 @@ typedef struct macroblockd {
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;
......@@ -462,6 +462,12 @@ static INLINE void update_partition_context(MACROBLOCKD *xd,
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
// bits of smaller block sizes to be zero.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment