Commit 1df427ef authored by Jean-Marc Valin's avatar Jean-Marc Valin Committed by Jean-Marc Valin

Fix ext_partition with cdef

Change-Id: If3a4c7e6aee747afd675e0233560f6e721c10f79
parent 9620bcd5
......@@ -2385,14 +2385,11 @@ static void decode_partition(AV1Decoder *const pbi, MACROBLOCKD *const xd,
#if CONFIG_EXT_PARTITION
if (cm->sb_size == BLOCK_128X128 && bsize == BLOCK_128X128) {
if (!sb_all_skip(cm, mi_row, mi_col)) {
cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.dering_gain =
aom_read_literal(r, cm->dering_bits, ACCT_STR);
cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.clpf_strength =
aom_read_literal(r, cm->clpf_bits, ACCT_STR);
cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.cdef_strength =
aom_read_literal(r, cm->cdef_bits, ACCT_STR);
} else {
cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.dering_gain =
cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]
->mbmi.clpf_strength = 0;
cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.cdef_strength =
0;
}
} else if (cm->sb_size == BLOCK_64X64 && bsize == BLOCK_64X64) {
#else
......
......@@ -2777,13 +2777,9 @@ static void write_modes_sb(AV1_COMP *const cpi, const TileInfo *const tile,
#if CONFIG_EXT_PARTITION
if (cm->sb_size == BLOCK_128X128 && bsize == BLOCK_128X128 &&
!sb_all_skip(cm, mi_row, mi_col)) {
aom_write_literal(
w,
cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]->mbmi.dering_gain,
cm->dering_bits);
aom_write_literal(w, cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]
->mbmi.clpf_strength,
cm->clpf_bits);
->mbmi.cdef_strength,
cm->cdef_bits);
} else if (cm->sb_size == BLOCK_64X64 && bsize == BLOCK_64X64 &&
#else
if (bsize == BLOCK_64X64 &&
......
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