anv/video: fix chroma qp to be a integer value.

This is just a cleanup to the genxml

Fixes: 98c58a16ef1a ("anv: add initial video decode support for h264.")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21433>

diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index cd95e6f..e9a472c 100644 (file)
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -4499,8 +4499,8 @@
     </field>
     <field name="Weighted Prediction Enable" start="108" end="108" type="bool" />
     <field name="Rho Domain Rate Control Enable" start="109" end="109" type="bool" />
-    <field name="First Chroma QP Offset" start="112" end="116" type="uint" />
-    <field name="Second Chroma QP Offset" start="120" end="124" type="uint" />
+    <field name="First Chroma QP Offset" start="112" end="116" type="int" />
+    <field name="Second Chroma QP Offset" start="120" end="124" type="int" />
     <field name="Field Picture" start="128" end="128" type="bool" />
     <field name="MBAFF Mode" start="129" end="129" type="bool" />
     <field name="Frame MB Only" start="130" end="130" type="bool" />

diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index 6ba6d3b..ca8f41b 100644 (file)
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -4667,8 +4667,8 @@
     </field>
     <field name="Weighted Prediction Enable" start="108" end="108" type="bool" />
     <field name="Rho Domain Rate Control Enable" start="109" end="109" type="bool" />
-    <field name="First Chroma QP Offset" start="112" end="116" type="uint" />
-    <field name="Second Chroma QP Offset" start="120" end="124" type="uint" />
+    <field name="First Chroma QP Offset" start="112" end="116" type="int" />
+    <field name="Second Chroma QP Offset" start="120" end="124" type="int" />
     <field name="Field Picture" start="128" end="128" type="bool" />
     <field name="MBAFF Mode" start="129" end="129" type="bool" />
     <field name="Frame MB Only" start="130" end="130" type="bool" />

diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index f75dffa..4cc4cf9 100644 (file)
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -5019,8 +5019,8 @@
     </field>
     <field name="Weighted Prediction Enable" start="108" end="108" type="bool" />
     <field name="Rho Domain Rate Control Enable" start="109" end="109" type="bool" />
-    <field name="First Chroma QP Offset" start="112" end="116" type="uint" />
-    <field name="Second Chroma QP Offset" start="120" end="124" type="uint" />
+    <field name="First Chroma QP Offset" start="112" end="116" type="int" />
+    <field name="Second Chroma QP Offset" start="120" end="124" type="int" />
     <field name="Field Picture" start="128" end="128" type="bool" />
     <field name="MBAFF Mode" start="129" end="129" type="bool" />
     <field name="Frame MB Only" start="130" end="130" type="bool" />

diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 30b0e66..380d20c 100644 (file)
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -2275,8 +2275,8 @@
       <value name="IMPLICIT" value="2" />
     </field>
     <field name="Weighted Prediction Enable" start="108" end="108" type="bool" />
-    <field name="First Chroma QP Offset" start="112" end="116" type="uint" />
-    <field name="Second Chroma QP Offset" start="120" end="124" type="uint" />
+    <field name="First Chroma QP Offset" start="112" end="116" type="int" />
+    <field name="Second Chroma QP Offset" start="120" end="124" type="int" />
     <field name="Field Picture" start="128" end="128" type="bool" />
     <field name="MBAFF Mode" start="129" end="129" type="bool" />
     <field name="Frame MB Only" start="130" end="130" type="bool" />

diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index 27f6733..3cf3ef9 100644 (file)
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -2620,8 +2620,8 @@
       <value name="IMPLICIT" value="2" />
     </field>
     <field name="Weighted Prediction Enable" start="108" end="108" type="bool" />
-    <field name="First Chroma QP Offset" start="112" end="116" type="uint" />
-    <field name="Second Chroma QP Offset" start="120" end="124" type="uint" />
+    <field name="First Chroma QP Offset" start="112" end="116" type="int" />
+    <field name="Second Chroma QP Offset" start="120" end="124" type="int" />
     <field name="Field Picture" start="128" end="128" type="bool" />
     <field name="MBAFF Mode" start="129" end="129" type="bool" />
     <field name="Frame MB Only" start="130" end="130" type="bool" />

diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 6ba7dad..9f0fa22 100644 (file)
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -2871,8 +2871,8 @@
       <value name="IMPLICIT" value="2" />
     </field>
     <field name="Weighted Prediction Enable" start="108" end="108" type="bool" />
-    <field name="First Chroma QP Offset" start="112" end="116" type="uint" />
-    <field name="Second Chroma QP Offset" start="120" end="124" type="uint" />
+    <field name="First Chroma QP Offset" start="112" end="116" type="int" />
+    <field name="Second Chroma QP Offset" start="120" end="124" type="int" />
     <field name="Field Picture" start="128" end="128" type="bool" />
     <field name="MBAFF Mode" start="129" end="129" type="bool" />
     <field name="Frame MB Only" start="130" end="130" type="bool" />

diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index caa54d3..ebd2a5a 100644 (file)
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -4108,8 +4108,8 @@
     </field>
     <field name="Weighted Prediction Enable" start="108" end="108" type="bool" />
     <field name="Rho Domain Rate Control Enable" start="109" end="109" type="bool" />
-    <field name="First Chroma QP Offset" start="112" end="116" type="uint" />
-    <field name="Second Chroma QP Offset" start="120" end="124" type="uint" />
+    <field name="First Chroma QP Offset" start="112" end="116" type="int" />
+    <field name="Second Chroma QP Offset" start="120" end="124" type="int" />
     <field name="Field Picture" start="128" end="128" type="bool" />
     <field name="MBAFF Mode" start="129" end="129" type="bool" />
     <field name="Frame MB Only" start="130" end="130" type="bool" />

diff --git a/src/intel/vulkan/genX_video.c b/src/intel/vulkan/genX_video.c
index 7163efa..0739726 100644 (file)
--- a/src/intel/vulkan/genX_video.c
+++ b/src/intel/vulkan/genX_video.c
@@ -249,8 +249,8 @@ anv_h264_decode_video(struct anv_cmd_buffer *cmd_buffer,
 
       avc_img.WeightedBiPredictionIDC = pps->weighted_bipred_idc;
       avc_img.WeightedPredictionEnable = pps->flags.weighted_pred_flag;
-      avc_img.FirstChromaQPOffset = pps->chroma_qp_index_offset & 0x1f;
-      avc_img.SecondChromaQPOffset = pps->second_chroma_qp_index_offset & 0x1f;
+      avc_img.FirstChromaQPOffset = pps->chroma_qp_index_offset;
+      avc_img.SecondChromaQPOffset = pps->second_chroma_qp_index_offset;
       avc_img.FieldPicture = h264_pic_info->pStdPictureInfo->flags.field_pic_flag;
       avc_img.MBAFFMode = (sps->flags.mb_adaptive_frame_field_flag &&
                            !h264_pic_info->pStdPictureInfo->flags.field_pic_flag);