diff options
| author | Jingning Han <jingning@google.com> | 2013-05-13 10:51:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-13 10:51:51 -0700 |
| commit | 089ed30d072e6f9ebd2403d84569c64a90ce190c (patch) | |
| tree | 2c30f906ad674f2123a9245f48c4a32795dcedfd /vp9/decoder | |
| parent | e996c9c5f10fbb2ad6605712d602ec77bcd81732 (diff) | |
| parent | 6910f178f1ca405157390abd6525d0bc81bcafb6 (diff) | |
| download | libvpx-089ed30d072e6f9ebd2403d84569c64a90ce190c.tar libvpx-089ed30d072e6f9ebd2403d84569c64a90ce190c.tar.gz libvpx-089ed30d072e6f9ebd2403d84569c64a90ce190c.tar.bz2 libvpx-089ed30d072e6f9ebd2403d84569c64a90ce190c.zip | |
Merge "Use consistent partition context setup in enc/dec" into experimental
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index dc4ac632b..ea5905bd8 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -476,12 +476,11 @@ static void decode_modes_sb(VP9D_COMP *pbi, int mi_row, int mi_col, assert(0); } // update partition context - if ((partition == PARTITION_SPLIT) && (bsize > BLOCK_SIZE_MB16X16)) - return; - - xd->left_seg_context = pc->left_seg_context + (mi_row & MI_MASK); - xd->above_seg_context = pc->above_seg_context + mi_col; - update_partition_context(xd, subsize, bsize); + if (bsize > BLOCK_SIZE_SB8X8 && + (bsize == BLOCK_SIZE_MB16X16 || partition != PARTITION_SPLIT)) { + set_partition_seg_context(pc, xd, mi_row, mi_col); + update_partition_context(xd, subsize, bsize); + } } static void setup_token_decoder(VP9D_COMP *pbi, |