From: Seungha Yang <seungha@centricular.com>
Date: Fri, 17 Dec 2021 10:49:42 +0000 (+0900)
Subject: d3d11av1dec: Sync DXVA AV1 data structure with released header
X-Git-Tag: 1.20.0~175
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=146815bbb66e1e0c19e22c58464bc1b6cbc58628;p=platform%2Fupstream%2Fgstreamer.git

d3d11av1dec: Sync DXVA AV1 data structure with released header

Update AV1 data structure based on Windows 11 SDK header

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1455>
---

diff --git a/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11av1dec.cpp b/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11av1dec.cpp
index 0ede0fd..e8bd7c8 100644
--- a/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11av1dec.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11av1dec.cpp
@@ -58,6 +58,8 @@ GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_av1_dec_debug);
  * and modified with "GST_" prefix
  */
 #pragma pack(push, 1)
+
+/* AV1 picture entry data structure */
 typedef struct _GST_DXVA_PicEntry_AV1
 {
   UINT width;
@@ -73,11 +75,11 @@ typedef struct _GST_DXVA_PicEntry_AV1
       UCHAR wmtype:2;
       UCHAR Reserved:5;
     };
-    UCHAR wGlobalMotionFlags;
-  };
+    UCHAR GlobalMotionFlags;
+  } DUMMYUNIONNAME;
 
   UCHAR Index;
-  USHORT Reserved16Bits;
+  UINT16 Reserved16Bits;
 
 } GST_DXVA_PicEntry_AV1;
 
@@ -338,17 +340,29 @@ typedef struct _GST_DXVA_PicParams_AV1
   UINT StatusReportFeedbackNumber;
 } GST_DXVA_PicParams_AV1;
 
+/* AV1 tile structure */
 typedef struct _GST_DXVA_Tile_AV1
 {
   UINT DataOffset;
   UINT DataSize;
   USHORT row;
   USHORT column;
-  USHORT Reserved16Bits;
+  UINT16 Reserved16Bits;
   UCHAR anchor_frame;
   UCHAR Reserved8Bits;
 } GST_DXVA_Tile_AV1;
 
+/* AV1 status reporting data structure */
+typedef struct _GST_DXVA_Status_AV1
+{
+  UINT StatusReportFeedbackNumber;
+  GST_DXVA_PicEntry_AV1 CurrPic;
+  UCHAR BufType;
+  UCHAR Status;
+  UCHAR Reserved8Bits;
+  USHORT NumMbsAffected;
+} GST_DXVA_Status_AV1;
+
 #pragma pack(pop)
 
 /* reference list 8 + 4 margin */