shithub: dav1d

Info  •  Files  •  Log  •  Branches

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 <rsbultje@gmail.com>

--- a/src/decode.c

+++ b/src/decode.c

@@ -954,7 +954,8 @@

         }

         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);