From f2fc9996d325443fcdedf699a9e8ff2c4247ce71 Mon Sep 17 00:00:00 2001 From: Sil Vilerino Date: Thu, 29 Sep 2022 11:52:45 -0400 Subject: [PATCH] frontends/va: Fix AV1 decode qm_* parameters reading from VADecPictureParameterBufferAV1 Reviewed-by: Ruijing Dong Those are being read with | 0xF, but instead should be & 0xF to clear the bits above 4 (the field is 4 bits in size) Part-of: --- src/gallium/frontends/va/picture_av1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/frontends/va/picture_av1.c b/src/gallium/frontends/va/picture_av1.c index 970aa7c8d27..fed64a665c7 100644 --- a/src/gallium/frontends/va/picture_av1.c +++ b/src/gallium/frontends/va/picture_av1.c @@ -208,9 +208,9 @@ void vlVaHandlePictureParameterBufferAV1(vlVaDriver *drv, vlVaContext *context, context->desc.av1.picture_parameter.v_ac_delta_q = av1->v_ac_delta_q; context->desc.av1.picture_parameter.qmatrix_fields.using_qmatrix = av1->qmatrix_fields.bits.using_qmatrix; - context->desc.av1.picture_parameter.qmatrix_fields.qm_y = av1->qmatrix_fields.bits.qm_y | 0xf; - context->desc.av1.picture_parameter.qmatrix_fields.qm_u = av1->qmatrix_fields.bits.qm_u | 0xf; - context->desc.av1.picture_parameter.qmatrix_fields.qm_v = av1->qmatrix_fields.bits.qm_v | 0xf; + context->desc.av1.picture_parameter.qmatrix_fields.qm_y = av1->qmatrix_fields.bits.qm_y & 0xf; + context->desc.av1.picture_parameter.qmatrix_fields.qm_u = av1->qmatrix_fields.bits.qm_u & 0xf; + context->desc.av1.picture_parameter.qmatrix_fields.qm_v = av1->qmatrix_fields.bits.qm_v & 0xf; /* Segmentation Params */ context->desc.av1.picture_parameter.seg_info.segment_info_fields.enabled =