Commit a32c5086 authored by David Michael Barr's avatar David Michael Barr

Lossless segments: allow CfL in 4x4 chroma blocks

This resolves a mismatch for libaom test vectors:
* av1-1-b8-00-quantizer-00.ivf
* av1-1-b10-00-quantizer-00.ivf
Helped-by: Ronald S. Bultje's avatarRonald S. Bultje <rsbultje@gmail.com>
parent da97ba3f
......@@ -954,7 +954,8 @@ static void decode_b(Dav1dTileContext *const t,
}
if (has_chroma) {
const int cfl_allowed = !!(cfl_allowed_mask & (1 << bs));
const int cfl_allowed = f->frame_hdr.segmentation.lossless[b->seg_id] ?
cbw4 == 1 && cbh4 == 1 : !!(cfl_allowed_mask & (1 << bs));
uint16_t *const uvmode_cdf = ts->cdf.m.uv_mode[cfl_allowed][b->y_mode];
b->uv_mode = msac_decode_symbol_adapt(&ts->msac, uvmode_cdf,
N_UV_INTRA_PRED_MODES - !cfl_allowed);
......
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