September 2023 - Wine-Commits

Biswapriyo Nath : include: Add ID3D12VideoEncodeCommandList2 in d3d12video.idl.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: 20f88c831e76d393e7ed9b24031ab7ca2cb73e02 URL: https://gitlab.winehq.org/wine/wine/-/commit/20f88c831e76d393e7ed9b24031ab7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:42:21 2023 +0000 include: Add ID3D12VideoEncodeCommandList2 in d3d12video.idl. --- include/d3d12video.idl | 385 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 385 insertions(+)

1 0

Biswapriyo Nath : include: Add ID3D12VideoEncodeCommandList1 in d3d12video.idl.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: 4ce218eea83b36e67c4b243aade7b7a82004c40c URL: https://gitlab.winehq.org/wine/wine/-/commit/4ce218eea83b36e67c4b243aade7b7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:42:16 2023 +0000 include: Add ID3D12VideoEncodeCommandList1 in d3d12video.idl. --- include/d3d12video.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 0ed7d453d4a..6a008afc356 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -758,6 +758,27 @@ interface ID3D12VideoDevice2 : ID3D12VideoDevice1 ); } +[ + uuid(94971eca-2bdb-4769-88cf-3675ea757ebc), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoEncodeCommandList1 : ID3D12VideoEncodeCommandList +{ + void InitializeExtensionCommand( + [in] ID3D12VideoExtensionCommand *extension_command, + [in] const void *initialization_parameters, + [in] SIZE_T initialization_parameters_size_in_bytes + ); + + void ExecuteExtensionCommand( + [in] ID3D12VideoExtensionCommand *extension_command, + [in] const void *execution_parameters, + [in] SIZE_T execution_parameters_size_in_bytes + ); +} + cpp_quote("DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_MPEG2, 0xee27417f, 0x5e28, 0x4e65, 0xbe, 0xea, 0x1d, 0x26, 0xb5, 0x08, 0xad, 0xc9);") cpp_quote("DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_MPEG1_AND_MPEG2, 0x86695f12, 0x340e, 0x4f04, 0x9f, 0xd3, 0x92, 0x53, 0xdd, 0x32, 0x74, 0x60);") cpp_quote("DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_H264, 0x1b81be68, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);")

1 0

Biswapriyo Nath : include: Add ID3D12VideoDecodeCommandList1 in d3d12video.idl.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: acd89320bfd3ba56096e9366bbbe2f77fa48c4a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/acd89320bfd3ba56096e9366bbbe2f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:42:11 2023 +0000 include: Add ID3D12VideoDecodeCommandList1 in d3d12video.idl. --- include/d3d12video.idl | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index f2a6e3a80f1..0ed7d453d4a 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -438,6 +438,46 @@ interface ID3D12VideoDecodeCommandList : ID3D12CommandList ); } +typedef struct D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAM +{ + UINT64 Offset; + ID3D12Resource *pBuffer; +} D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAM; + +typedef struct D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1 +{ + BOOL Enable; + ID3D12Resource *pReferenceTexture2D; + UINT ReferenceSubresource; + DXGI_COLOR_SPACE_TYPE OutputColorSpace; + DXGI_COLOR_SPACE_TYPE DecodeColorSpace; + UINT OutputWidth; + UINT OutputHeight; +} D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1; + +typedef struct D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1 +{ + ID3D12Resource *pOutputTexture2D; + UINT OutputSubresource; + D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1 ConversionArguments; + D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAM Histograms[D3D12_VIDEO_DECODE_MAX_HISTOGRAM_COMPONENTS]; +} D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1; + +[ + uuid(d52f011b-b56e-453c-a05a-a7f311c8f472), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecodeCommandList1 : ID3D12VideoDecodeCommandList +{ + void DecodeFrame1( + [in] ID3D12VideoDecoder *decoder, + [in] const D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1 *output_arguments, + [in] const D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *input_arguments + ); +} + typedef enum D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE { D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_8X8 = 0,

1 0

Biswapriyo Nath : include: Add ID3D12VideoEncodeCommandList in d3d12video.idl.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: f30848ae177f87ea10f7effd42d1a80ac26a5723 URL: https://gitlab.winehq.org/wine/wine/-/commit/f30848ae177f87ea10f7effd42d1a8… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:42:06 2023 +0000 include: Add ID3D12VideoEncodeCommandList in d3d12video.idl. --- include/d3d12video.idl | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 6726f27dfb0..f2a6e3a80f1 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -522,6 +522,130 @@ interface ID3D12VideoDevice1 : ID3D12VideoDevice ); } +typedef struct D3D12_RESOURCE_COORDINATE +{ + UINT64 X; + UINT Y; + UINT Z; + UINT SubresourceIndex; +} D3D12_RESOURCE_COORDINATE; + +typedef struct D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUT +{ + ID3D12VideoMotionVectorHeap *pMotionVectorHeap; +} D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUT; + +typedef struct D3D12_VIDEO_MOTION_ESTIMATOR_INPUT +{ + ID3D12Resource *pInputTexture2D; + UINT InputSubresourceIndex; + ID3D12Resource *pReferenceTexture2D; + UINT ReferenceSubresourceIndex; + ID3D12VideoMotionVectorHeap *pHintMotionVectorHeap; +} D3D12_VIDEO_MOTION_ESTIMATOR_INPUT; + +typedef struct D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUT +{ + ID3D12Resource *pMotionVectorTexture2D; + D3D12_RESOURCE_COORDINATE MotionVectorCoordinate; +} D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUT; + +typedef struct D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUT +{ + ID3D12VideoMotionVectorHeap *pMotionVectorHeap; + UINT PixelWidth; + UINT PixelHeight; +} D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUT; + +[ + uuid(8455293a-0cbd-4831-9b39-fbdbab724723), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoEncodeCommandList : ID3D12CommandList +{ + HRESULT Close(); + + HRESULT Reset( + [in] ID3D12CommandAllocator *allocator + ); + + void ClearState(); + + void ResourceBarrier( + [in] UINT barriers_count, + [in] const D3D12_RESOURCE_BARRIER *barriers + ); + + void DiscardResource( + [in] ID3D12Resource *resource, + [in, optional] const D3D12_DISCARD_REGION *region + ); + + void BeginQuery( + [in] ID3D12QueryHeap *query_heap, + [in] D3D12_QUERY_TYPE type, + [in] UINT index + ); + + void EndQuery( + [in] ID3D12QueryHeap *query_heap, + [in] D3D12_QUERY_TYPE type, + [in] UINT index + ); + + void ResolveQueryData( + [in] ID3D12QueryHeap *query_heap, + [in] D3D12_QUERY_TYPE type, + [in] UINT start_index, + [in] UINT queries_count, + [in] ID3D12Resource *destination_buffer, + [in] UINT64 aligned_destination_buffer_offset + ); + + void SetPredication( + [in, optional] ID3D12Resource *buffer, + [in] UINT64 aligned_buffer_offset, + [in] D3D12_PREDICATION_OP operation + ); + + void SetMarker( + [in] UINT metadata, + [in] const void *data, + [in] UINT size + ); + + void BeginEvent( + [in] UINT metadata, + [in] const void *data, + [in] UINT size + ); + + void EndEvent(); + + void EstimateMotion( + [in] ID3D12VideoMotionEstimator *motion_estimator, + [in] const D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUT *output_arguments, + [in] const D3D12_VIDEO_MOTION_ESTIMATOR_INPUT *input_arguments + ); + + void ResolveMotionVectorHeap( + [in] const D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUT *output_arguments, + [in] const D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUT *input_arguments + ); + + void WriteBufferImmediate( + [in] UINT count, + [in] const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *params, + [in] const D3D12_WRITEBUFFERIMMEDIATE_MODE *modes + ); + + void SetProtectedResourceSession( + [in, optional]ID3D12ProtectedResourceSession *protected_resource_session + ); +} + typedef struct D3D12_VIDEO_EXTENSION_COMMAND_DESC { UINT NodeMask;

1 0

Biswapriyo Nath : include: Add ID3D12VideoMotionVectorHeap in d3d12video.idl.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: ee165f1d39220ae5b80ab7e04a051d567fa230da URL: https://gitlab.winehq.org/wine/wine/-/commit/ee165f1d39220ae5b80ab7e04a051d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:42:01 2023 +0000 include: Add ID3D12VideoMotionVectorHeap in d3d12video.idl. --- include/d3d12video.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 12ecd49e9fc..6726f27dfb0 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -483,6 +483,22 @@ typedef struct D3D12_VIDEO_MOTION_VECTOR_HEAP_DESC D3D12_VIDEO_SIZE_RANGE SizeRange; } D3D12_VIDEO_MOTION_VECTOR_HEAP_DESC; +[ + uuid(5be17987-743a-4061-834b-23d22daea505), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoMotionVectorHeap : ID3D12Pageable +{ + D3D12_VIDEO_MOTION_VECTOR_HEAP_DESC GetDesc(); + + HRESULT GetProtectedResourceSession( + [in] REFIID riid, + [out, iid_is(riid)] void **protected_session + ); +} + [ uuid(981611ad-a144-4c83-9890-f30e26d658ab), object,

1 0

Biswapriyo Nath : include: Add ID3D12VideoMotionEstimator in d3d12video.idl.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: e09dd6a3dd6a3393c21c76395d69735df999a9a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e09dd6a3dd6a3393c21c76395d6973… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:41:53 2023 +0000 include: Add ID3D12VideoMotionEstimator in d3d12video.idl. --- include/d3d12video.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 277ceb8776d..12ecd49e9fc 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -458,6 +458,22 @@ typedef struct D3D12_VIDEO_MOTION_ESTIMATOR_DESC D3D12_VIDEO_SIZE_RANGE SizeRange; } D3D12_VIDEO_MOTION_ESTIMATOR_DESC; +[ + uuid(33fdae0e-098b-428f-87bb-34b695de08f8), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoMotionEstimator : ID3D12Pageable +{ + D3D12_VIDEO_MOTION_ESTIMATOR_DESC GetDesc(); + + HRESULT GetProtectedResourceSession( + [in] REFIID riid, + [out, iid_is(riid)] void **protected_session + ); +} + typedef struct D3D12_VIDEO_MOTION_VECTOR_HEAP_DESC { UINT NodeMask;

1 0

Biswapriyo Nath : include: Add ID3D12VideoDevice3 in d3d12video.idl.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: 15b46d5b56a5f31020150176aa711427932656f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/15b46d5b56a5f31020150176aa7114… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:41:47 2023 +0000 include: Add ID3D12VideoDevice3 in d3d12video.idl. --- include/d3d12video.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 723d8aa8826..277ceb8776d 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -687,6 +687,17 @@ typedef enum D3D12_VIDEO_ENCODER_HEAP_FLAGS } D3D12_VIDEO_ENCODER_HEAP_FLAGS; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_HEAP_FLAGS);") +typedef struct D3D12_VIDEO_ENCODER_HEAP_DESC +{ + UINT NodeMask; + D3D12_VIDEO_ENCODER_HEAP_FLAGS Flags; + D3D12_VIDEO_ENCODER_CODEC EncodeCodec; + D3D12_VIDEO_ENCODER_PROFILE_DESC EncodeProfile; + D3D12_VIDEO_ENCODER_LEVEL_SETTING EncodeLevel; + UINT ResolutionsListCount; + const D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC *pResolutionList; +} D3D12_VIDEO_ENCODER_HEAP_DESC; + typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES { D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_0_ALL_LUMA_CHROMA_SLICE_BLOCK_EDGES_ALWAYS_FILTERED = 0, @@ -782,6 +793,17 @@ typedef enum D3D12_VIDEO_ENCODER_FLAGS } D3D12_VIDEO_ENCODER_FLAGS; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_FLAGS);") +typedef struct D3D12_VIDEO_ENCODER_DESC +{ + UINT NodeMask; + D3D12_VIDEO_ENCODER_FLAGS Flags; + D3D12_VIDEO_ENCODER_CODEC EncodeCodec; + D3D12_VIDEO_ENCODER_PROFILE_DESC EncodeProfile; + DXGI_FORMAT InputFormat; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION CodecConfiguration; + D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE MaxMotionEstimationPrecision; +} D3D12_VIDEO_ENCODER_DESC; + [ uuid(2e0d212d-8df9-44a6-a770-bb289b182737), object, @@ -838,3 +860,24 @@ interface ID3D12VideoEncoderHeap : ID3D12Pageable [out] D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC *resolution_list ); } + +[ + uuid(4243adb4-3a32-4666-973c-0ccc5625dc44), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDevice3 : ID3D12VideoDevice2 +{ + HRESULT CreateVideoEncoder( + [in] const D3D12_VIDEO_ENCODER_DESC *desc, + [in] REFIID riid, + [out] void **video_encoder + ); + + HRESULT CreateVideoEncoderHeap( + [in] const D3D12_VIDEO_ENCODER_HEAP_DESC *desc, + [in] REFIID riid, + [out] void **video_encoder_heap + ); +}

1 0

Biswapriyo Nath : include: Add ID3D12VideoEncoderHeap in d3d12video.idl.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: c965dbae349017264458d90f19e72c40f7cf2f1f URL: https://gitlab.winehq.org/wine/wine/-/commit/c965dbae349017264458d90f19e72c… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:41:41 2023 +0000 include: Add ID3D12VideoEncoderHeap in d3d12video.idl. --- include/d3d12video.idl | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 2dbba443cdc..723d8aa8826 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -612,6 +612,81 @@ typedef struct D3D12_VIDEO_ENCODER_PROFILE_DESC }; } D3D12_VIDEO_ENCODER_PROFILE_DESC; +typedef enum D3D12_VIDEO_ENCODER_LEVELS_H264 +{ + D3D12_VIDEO_ENCODER_LEVELS_H264_1 = 0, + D3D12_VIDEO_ENCODER_LEVELS_H264_1b = 1, + D3D12_VIDEO_ENCODER_LEVELS_H264_11 = 2, + D3D12_VIDEO_ENCODER_LEVELS_H264_12 = 3, + D3D12_VIDEO_ENCODER_LEVELS_H264_13 = 4, + D3D12_VIDEO_ENCODER_LEVELS_H264_2 = 5, + D3D12_VIDEO_ENCODER_LEVELS_H264_21 = 6, + D3D12_VIDEO_ENCODER_LEVELS_H264_22 = 7, + D3D12_VIDEO_ENCODER_LEVELS_H264_3 = 8, + D3D12_VIDEO_ENCODER_LEVELS_H264_31 = 9, + D3D12_VIDEO_ENCODER_LEVELS_H264_32 = 10, + D3D12_VIDEO_ENCODER_LEVELS_H264_4 = 11, + D3D12_VIDEO_ENCODER_LEVELS_H264_41 = 12, + D3D12_VIDEO_ENCODER_LEVELS_H264_42 = 13, + D3D12_VIDEO_ENCODER_LEVELS_H264_5 = 14, + D3D12_VIDEO_ENCODER_LEVELS_H264_51 = 15, + D3D12_VIDEO_ENCODER_LEVELS_H264_52 = 16, + D3D12_VIDEO_ENCODER_LEVELS_H264_6 = 17, + D3D12_VIDEO_ENCODER_LEVELS_H264_61 = 18, + D3D12_VIDEO_ENCODER_LEVELS_H264_62 = 19, +} D3D12_VIDEO_ENCODER_LEVELS_H264; + +typedef enum D3D12_VIDEO_ENCODER_TIER_HEVC +{ + D3D12_VIDEO_ENCODER_TIER_HEVC_MAIN = 0, + D3D12_VIDEO_ENCODER_TIER_HEVC_HIGH = 1, +} D3D12_VIDEO_ENCODER_TIER_HEVC; + +typedef enum D3D12_VIDEO_ENCODER_LEVELS_HEVC +{ + D3D12_VIDEO_ENCODER_LEVELS_HEVC_1 = 0, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_2 = 1, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_21 = 2, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_3 = 3, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_31 = 4, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_4 = 5, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_41 = 6, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_5 = 7, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_51 = 8, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_52 = 9, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_6 = 10, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_61 = 11, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_62 = 12, +} D3D12_VIDEO_ENCODER_LEVELS_HEVC; + +typedef struct D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC +{ + D3D12_VIDEO_ENCODER_LEVELS_HEVC Level; + D3D12_VIDEO_ENCODER_TIER_HEVC Tier; +} D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC; + +typedef struct D3D12_VIDEO_ENCODER_LEVEL_SETTING +{ + UINT DataSize; + union + { + D3D12_VIDEO_ENCODER_LEVELS_H264 *pH264LevelSetting; + D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC *pHEVCLevelSetting; + }; +} D3D12_VIDEO_ENCODER_LEVEL_SETTING; + +typedef struct D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC +{ + UINT Width; + UINT Height; +} D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC; + +typedef enum D3D12_VIDEO_ENCODER_HEAP_FLAGS +{ + D3D12_VIDEO_ENCODER_HEAP_FLAG_NONE = 0x0, +} D3D12_VIDEO_ENCODER_HEAP_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_HEAP_FLAGS);") + typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES { D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_0_ALL_LUMA_CHROMA_SLICE_BLOCK_EDGES_ALWAYS_FILTERED = 0, @@ -733,3 +808,33 @@ interface ID3D12VideoEncoder : ID3D12Pageable D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE GetMaxMotionEstimationPrecision(); } + +[ + uuid(22b35d96-876a-44c0-b25e-fb8c9c7f1c4a), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoEncoderHeap : ID3D12Pageable +{ + UINT GetNodeMask(); + + D3D12_VIDEO_ENCODER_HEAP_FLAGS GetEncoderHeapFlags(); + + D3D12_VIDEO_ENCODER_CODEC GetCodec(); + + HRESULT GetCodecProfile( + [in, out] D3D12_VIDEO_ENCODER_PROFILE_DESC dst_profile + ); + + HRESULT GetCodecLevel( + [in, out] D3D12_VIDEO_ENCODER_LEVEL_SETTING dst_level + ); + + UINT GetResolutionListCount(); + + HRESULT GetResolutionList( + [in] const UINT resolutions_list_count, + [out] D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC *resolution_list + ); +}

1 0

Biswapriyo Nath : include: Add ID3D12VideoEncoder in d3d12video.idl.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: 9e5778b81e48b9b47be5a59174e0a39c2c6a2d12 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e5778b81e48b9b47be5a59174e0a3… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:41:10 2023 +0000 include: Add ID3D12VideoEncoder in d3d12video.idl. --- include/d3d12video.idl | 151 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 3e65ed96fca..2dbba443cdc 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -582,3 +582,154 @@ cpp_quote("DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_AV1_PROFILE1, 0x6936ff0f, 0x45 cpp_quote("DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_AV1_PROFILE2, 0x0c5f2aa1, 0xe541, 0x4089, 0xbb, 0x7b, 0x98, 0x11, 0x0a, 0x19, 0xd7, 0xc8);") cpp_quote("DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_AV1_12BIT_PROFILE2, 0x17127009, 0xa00f, 0x4ce1, 0x99, 0x4e, 0xbf, 0x40, 0x81, 0xf6, 0xf3, 0xf0);") cpp_quote("DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_AV1_12BIT_PROFILE2_420, 0x2d80bed6, 0x9cac, 0x4835, 0x9e, 0x91, 0x32, 0x7b, 0xbc, 0x4f, 0x9e, 0xe8);") + +typedef enum D3D12_VIDEO_ENCODER_CODEC +{ + D3D12_VIDEO_ENCODER_CODEC_H264 = 0, + D3D12_VIDEO_ENCODER_CODEC_HEVC = 1, +} D3D12_VIDEO_ENCODER_CODEC; + +typedef enum D3D12_VIDEO_ENCODER_PROFILE_H264 +{ + D3D12_VIDEO_ENCODER_PROFILE_H264_MAIN = 0, + D3D12_VIDEO_ENCODER_PROFILE_H264_HIGH = 1, + D3D12_VIDEO_ENCODER_PROFILE_H264_HIGH_10 = 2, +} D3D12_VIDEO_ENCODER_PROFILE_H264; + +typedef enum D3D12_VIDEO_ENCODER_PROFILE_HEVC +{ + D3D12_VIDEO_ENCODER_PROFILE_HEVC_MAIN = 0, + D3D12_VIDEO_ENCODER_PROFILE_HEVC_MAIN10 = 1, +} D3D12_VIDEO_ENCODER_PROFILE_HEVC; + +typedef struct D3D12_VIDEO_ENCODER_PROFILE_DESC +{ + UINT DataSize; + union + { + D3D12_VIDEO_ENCODER_PROFILE_H264 *pH264Profile; + D3D12_VIDEO_ENCODER_PROFILE_HEVC *pHEVCProfile; + }; +} D3D12_VIDEO_ENCODER_PROFILE_DESC; + +typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES +{ + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_0_ALL_LUMA_CHROMA_SLICE_BLOCK_EDGES_ALWAYS_FILTERED = 0, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_1_DISABLE_ALL_SLICE_BLOCK_EDGES = 1, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_2_DISABLE_SLICE_BOUNDARIES_BLOCKS = 2, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_3_USE_TWO_STAGE_DEBLOCKING = 3, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_4_DISABLE_CHROMA_BLOCK_EDGES = 4, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_5_DISABLE_CHROMA_BLOCK_EDGES_AND_LUMA_BOUNDARIES = 5, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_6_DISABLE_CHROMA_BLOCK_EDGES_AND_USE_LUMA_TWO_STAGE_DEBLOCKING = 6, +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES; + +typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE { + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE_8x8 = 0, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE_16x16 = 1, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE_32x32 = 2, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE_64x64 = 3, +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE; + +typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE { + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE_4x4 = 0, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE_8x8 = 1, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE_16x16 = 2, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE_32x32 = 3, +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE; + +typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAGS +{ + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_NONE = 0x0, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_USE_CONSTRAINED_INTRAPREDICTION = 0x1, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_USE_ADAPTIVE_8x8_TRANSFORM = 0x2, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_ENABLE_CABAC_ENCODING = 0x4, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_ALLOW_REQUEST_INTRA_CONSTRAINED_SLICES = 0x8, +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAGS);") + +typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES { + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES_DISABLED = 0, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES_TEMPORAL = 1, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES_SPATIAL = 2, +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES; + +typedef struct D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264 +{ + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAGS ConfigurationFlags; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES DirectModeConfig; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES DisableDeblockingFilterConfig; +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264; + +typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAGS +{ + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAG_NONE = 0x0, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAG_DISABLE_LOOP_FILTER_ACROSS_SLICES = 0x1, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAG_ALLOW_REQUEST_INTRA_CONSTRAINED_SLICES = 0x2, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAG_ENABLE_SAO_FILTER = 0x4, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAG_ENABLE_LONG_TERM_REFERENCES = 0x8, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAG_USE_ASYMETRIC_MOTION_PARTITION = 0x10, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAG_ENABLE_TRANSFORM_SKIPPING = 0x20, + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAG_USE_CONSTRAINED_INTRAPREDICTION = 0x40, +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAGS);") + +typedef struct D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC { + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAGS ConfigurationFlags; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE MinLumaCodingUnitSize; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE MaxLumaCodingUnitSize; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE MinLumaTransformUnitSize; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE MaxLumaTransformUnitSize; + UCHAR max_transform_hierarchy_depth_inter; + UCHAR max_transform_hierarchy_depth_intra; +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC; + +typedef struct D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION +{ + UINT DataSize; + union + { + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264 *pH264Config; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC *pHEVCConfig; + }; +} D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION; + +typedef enum D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE +{ + D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_MAXIMUM = 0, + D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_FULL_PIXEL = 1, + D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_HALF_PIXEL = 2, + D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_QUARTER_PIXEL = 3, +} D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE; + +typedef enum D3D12_VIDEO_ENCODER_FLAGS +{ + D3D12_VIDEO_ENCODER_FLAG_NONE = 0x0, +} D3D12_VIDEO_ENCODER_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_FLAGS);") + +[ + uuid(2e0d212d-8df9-44a6-a770-bb289b182737), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoEncoder : ID3D12Pageable +{ + UINT GetNodeMask(); + + D3D12_VIDEO_ENCODER_FLAGS GetEncoderFlags(); + + D3D12_VIDEO_ENCODER_CODEC GetCodec(); + + HRESULT GetCodecProfile( + [in, out] D3D12_VIDEO_ENCODER_PROFILE_DESC dst_profile + ); + + HRESULT GetCodecConfiguration( + [in, out] D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION dst_codec_config + ); + + DXGI_FORMAT GetInputFormat(); + + D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE GetMaxMotionEstimationPrecision(); +}

1 0

Alistair Leslie-Hughes : msado15: _Recordset::Filter set index on value.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: dcba11c185858aa73a9568d4ed26c0bdaf9abc36 URL: https://gitlab.winehq.org/wine/wine/-/commit/dcba11c185858aa73a9568d4ed26c0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 26 19:31:30 2023 +1000 msado15: _Recordset::Filter set index on value. --- dlls/msado15/recordset.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a70fc2b33ac..9107aca26e7 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -2196,7 +2196,14 @@ static HRESULT WINAPI recordset_put_Filter( _Recordset *iface, VARIANT criteria if (V_VT(&criteria) == VT_BSTR && recordset->state == adStateOpen) { - FIXME("Validating fields not performed\n"); + FIXME("No filter performed. Reporting no records found.\n"); + + /* Set the index to signal we didn't find a record. */ + recordset->index = -1; + } + else + { + recordset->index = recordset->count ? 0 : -1; /* Reset */ } VariantCopy(&recordset->filter, &criteria);

1 0