diff options
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 4d07997f1..36808408b 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -489,12 +489,21 @@ static void decode_modes_sb(VP9D_COMP *pbi, int mi_row, int mi_col, if (bsize >= BLOCK_SIZE_SB8X8) { int pl; + int idx = check_bsize_coverage(pc, xd, mi_row, mi_col, bsize); // read the partition information xd->left_seg_context = pc->left_seg_context + (mi_row & MI_MASK); xd->above_seg_context = pc->above_seg_context + mi_col; pl = partition_plane_context(xd, bsize); - partition = treed_read(r, vp9_partition_tree, - pc->fc.partition_prob[pc->frame_type][pl]); + + if (idx == 0) + partition = treed_read(r, vp9_partition_tree, + pc->fc.partition_prob[pc->frame_type][pl]); + else if (idx > 0 && + !vp9_read(r, pc->fc.partition_prob[pc->frame_type][pl][idx])) + partition = (idx == 1) ? PARTITION_HORZ : PARTITION_VERT; + else + partition = PARTITION_SPLIT; + pc->fc.partition_counts[pl][partition]++; } |