X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=specs%2Fd3d9dxva2.py;h=5c52f98df72524727a95322d252604a5589abf43;hb=940cdb8b143455fe2fc002ffd50f5e2ffcaf1260;hp=36499b7fac457a97b79cd6689ef51b10046c6967;hpb=43aa19fc1cf6979328dd6a1f6bcf33f74792faec;p=apitrace

diff --git a/specs/d3d9dxva2.py b/specs/d3d9dxva2.py
index 36499b7..5c52f98 100644
--- a/specs/d3d9dxva2.py
+++ b/specs/d3d9dxva2.py
@@ -184,7 +184,7 @@ DXVA2_DecodeExtensionData = Struct("DXVA2_DecodeExtensionData", [
 
 DXVA2_DecodeExecuteParams = Struct("DXVA2_DecodeExecuteParams", [
     (UINT, "NumCompBuffers"),
-    (Pointer(DXVA2_DecodeBufferDesc), "pCompressedBuffers"),
+    (Array(DXVA2_DecodeBufferDesc, "{self}.NumCompBuffers"), "pCompressedBuffers"),
     (Pointer(DXVA2_DecodeExtensionData), "pExtensionData"),
 ])
 
@@ -263,7 +263,15 @@ DXVA2_VideoProcessorCaps = Struct("DXVA2_VideoProcessorCaps", [
 ])
 
 
-DXVA2_PVP_SETKEY = Opaque('DXVA2_PVP_SETKEY')
+# See also DXVADDI_PVP_KEY128
+DXVA2_PVP_KEY128 = Struct('DXVA2_PVP_KEY128', [
+    (Array(BYTE, 16), 'Data'),
+])
+
+# See also DXVADDI_PVP_SETKEY
+DXVA2_PVP_SETKEY = Struct('DXVA2_PVP_SETKEY', [
+    (DXVA2_PVP_KEY128, 'ContentKey'),
+])
 
 DXVA2_DECODEBUFFERDESC = Struct("DXVA2_DECODEBUFFERDESC", [
     (ObjPointer(IDirect3DSurface9), "pRenderTarget"),
@@ -321,7 +329,7 @@ DXVA2_DECODEBUFFERINFO = Opaque('DXVA2_DECODEBUFFERINFO')
 
 IDirect3DDecodeDevice9 = Interface("IDirect3DDecodeDevice9", IUnknown)
 IDirect3DDecodeDevice9.methods += [
-    StdMethod(HRESULT, "DecodeBeginFrame", [(OpaquePointer(DXVA2_PVP_SETKEY), "pPVPSetKey")]),
+    StdMethod(HRESULT, "DecodeBeginFrame", [(Pointer(DXVA2_PVP_SETKEY), "pPVPSetKey")]),
     StdMethod(HRESULT, "DecodeEndFrame", [(Pointer(HANDLE), "pHandleComplete")]),
     StdMethod(HRESULT, "DecodeSetRenderTarget", [(ObjPointer(IDirect3DSurface9), "pRenderTarget")]),
     StdMethod(HRESULT, "DecodeExecute", [(Pointer(DXVA2_DECODEEXECUTE), "pExecuteParams")]),