Commit c8de931e authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Gerrit Code Review

Merge "Fix i4x4 mode reading and writing in sb8x8 bitstream." into experimental

parents 1cc0e67d e931dac7
......@@ -952,7 +952,12 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
// required for left and above block mv
mv0->as_int = 0;
if (mbmi->sb_type > BLOCK_SIZE_MB16X16) {
#if CONFIG_SB8X8
if (mbmi->sb_type > BLOCK_SIZE_SB8X8)
#else
if (mbmi->sb_type > BLOCK_SIZE_MB16X16)
#endif
{
mbmi->mode = read_sb_ymode(r, cm->fc.sb_ymode_prob);
cm->fc.sb_ymode_counts[mbmi->mode]++;
} else {
......@@ -970,7 +975,7 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
if (m == B_CONTEXT_PRED) m -= CONTEXT_PRED_REPLACEMENTS;
#endif
cm->fc.bmode_counts[m]++;
} while (++j < 16);
} while (++j < (16 >> (2 * CONFIG_SB8X8)));
}
#if !CONFIG_SB8X8
......
......@@ -671,7 +671,11 @@ static void pack_inter_mode_mvs(VP9_COMP *cpi, MODE_INFO *m,
active_section = 6;
#endif
#if CONFIG_SB8X8
if (m->mbmi.sb_type > BLOCK_SIZE_SB8X8)
#else
if (m->mbmi.sb_type > BLOCK_SIZE_MB16X16)
#endif
write_sb_ymode(bc, mode, pc->fc.sb_ymode_prob);
else
write_ymode(bc, mode, pc->fc.ymode_prob);
......
......@@ -2073,7 +2073,12 @@ static void sum_intra_stats(VP9_COMP *cpi, MACROBLOCK *x) {
#endif
#endif
if (xd->mode_info_context->mbmi.sb_type > BLOCK_SIZE_MB16X16) {
#if CONFIG_SB8X8
if (xd->mode_info_context->mbmi.sb_type > BLOCK_SIZE_SB8X8)
#else
if (xd->mode_info_context->mbmi.sb_type > BLOCK_SIZE_MB16X16)
#endif
{
++cpi->sb_ymode_count[m];
} else {
++cpi->ymode_count[m];
......
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