Skip to content

Commit 690171b

Browse files
SerafimArtsSerafimArts
committed
Upgrade vk headers from 1.3.208 to 1.3.209
1 parent 6d3e03a commit 690171b

31 files changed

+318
-322
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<p align="center">
88
<a href="https://github.com/php-ffi-headers/vulkan-headers/actions"><img src="https://github.com/php-ffi-headers/vulkan-headers/workflows/build/badge.svg"></a>
99
<a href="https://packagist.org/packages/ffi-headers/vulkan-headers"><img src="https://img.shields.io/badge/PHP-8.1.0-ff0140.svg"></a>
10-
<a href="https://packagist.org/packages/ffi-headers/vulkan-headers"><img src="https://img.shields.io/badge/Vulkan-1.3.208-cc3c20.svg"></a>
10+
<a href="https://packagist.org/packages/ffi-headers/vulkan-headers"><img src="https://img.shields.io/badge/Vulkan-1.3.209-cc3c20.svg"></a>
1111
<a href="https://packagist.org/packages/ffi-headers/vulkan-headers"><img src="https://poser.pugx.org/ffi-headers/vulkan-headers/version" alt="Latest Stable Version"></a>
1212
<a href="https://packagist.org/packages/ffi-headers/vulkan-headers"><img src="https://poser.pugx.org/ffi-headers/vulkan-headers/v/unstable" alt="Latest Unstable Version"></a>
1313
<a href="https://packagist.org/packages/ffi-headers/vulkan-headers"><img src="https://poser.pugx.org/ffi-headers/vulkan-headers/downloads" alt="Total Downloads"></a>

‎resources/headers/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
*
22
!.gitignore
3-
!1.3.208/*
3+
!1.3.209/*
44
!platform/*
55
!vulkan_prototypes_1.0.h

‎resources/headers/1.3.208/vk_video/vulkan_video_codec_h264std.h renamed to ‎resources/headers/1.3.209/vk_video/vulkan_video_codec_h264std.h

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,13 @@ extern "C" {
2121

2222
#define vulkan_video_codec_h264std 1
2323
#include <stdint.h>
24-
// Vulkan 0.9 provisional Vulkan video H.264 encode and decode std specification version number
25-
#define VK_STD_VULKAN_VIDEO_CODEC_H264_API_VERSION_0_9_5 VK_MAKE_VIDEO_STD_VERSION(0, 9, 5) // Patch version should always be set to 0
26-
2724
#define STD_VIDEO_H264_CPB_CNT_LIST_SIZE 32
2825
#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS 6
2926
#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS 16
3027
#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS 2
3128
#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS 64
32-
#define VK_STD_VULKAN_VIDEO_CODEC_H264_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H264_API_VERSION_0_9_5
33-
#define VK_STD_VULKAN_VIDEO_CODEC_H264_EXTENSION_NAME "VK_STD_vulkan_video_codec_h264"
29+
#define STD_VIDEO_H264_MAX_NUM_LIST_REF 32
30+
#define STD_VIDEO_H264_MAX_CHROMA_PLANES 2
3431

3532
typedef enum StdVideoH264ChromaFormatIdc {
3633
STD_VIDEO_H264_CHROMA_FORMAT_IDC_MONOCHROME = 0,
@@ -207,19 +204,19 @@ typedef struct StdVideoH264HrdParameters {
207204
} StdVideoH264HrdParameters;
208205

209206
typedef struct StdVideoH264SequenceParameterSetVui {
210-
StdVideoH264AspectRatioIdc aspect_ratio_idc;
211-
uint16_t sar_width;
212-
uint16_t sar_height;
213-
uint8_t video_format;
214-
uint8_t color_primaries;
215-
uint8_t transfer_characteristics;
216-
uint8_t matrix_coefficients;
217-
uint32_t num_units_in_tick;
218-
uint32_t time_scale;
219-
StdVideoH264HrdParameters* pHrdParameters;
220-
uint8_t max_num_reorder_frames;
221-
uint8_t max_dec_frame_buffering;
222-
StdVideoH264SpsVuiFlags flags;
207+
StdVideoH264SpsVuiFlags flags;
208+
StdVideoH264AspectRatioIdc aspect_ratio_idc;
209+
uint16_t sar_width;
210+
uint16_t sar_height;
211+
uint8_t video_format;
212+
uint8_t color_primaries;
213+
uint8_t transfer_characteristics;
214+
uint8_t matrix_coefficients;
215+
uint32_t num_units_in_tick;
216+
uint32_t time_scale;
217+
const StdVideoH264HrdParameters* pHrdParameters;
218+
uint8_t max_num_reorder_frames;
219+
uint8_t max_dec_frame_buffering;
223220
} StdVideoH264SequenceParameterSetVui;
224221

225222
typedef struct StdVideoH264SpsFlags {
@@ -249,29 +246,29 @@ typedef struct StdVideoH264ScalingLists {
249246
} StdVideoH264ScalingLists;
250247

251248
typedef struct StdVideoH264SequenceParameterSet {
252-
StdVideoH264ProfileIdc profile_idc;
253-
StdVideoH264Level level_idc;
254-
uint8_t seq_parameter_set_id;
255-
StdVideoH264ChromaFormatIdc chroma_format_idc;
256-
uint8_t bit_depth_luma_minus8;
257-
uint8_t bit_depth_chroma_minus8;
258-
uint8_t log2_max_frame_num_minus4;
259-
StdVideoH264PocType pic_order_cnt_type;
260-
uint8_t log2_max_pic_order_cnt_lsb_minus4;
261-
int32_t offset_for_non_ref_pic;
262-
int32_t offset_for_top_to_bottom_field;
263-
uint8_t num_ref_frames_in_pic_order_cnt_cycle;
264-
uint8_t max_num_ref_frames;
265-
uint32_t pic_width_in_mbs_minus1;
266-
uint32_t pic_height_in_map_units_minus1;
267-
uint32_t frame_crop_left_offset;
268-
uint32_t frame_crop_right_offset;
269-
uint32_t frame_crop_top_offset;
270-
uint32_t frame_crop_bottom_offset;
271-
StdVideoH264SpsFlags flags;
272-
int32_t* pOffsetForRefFrame;
273-
StdVideoH264ScalingLists* pScalingLists;
274-
StdVideoH264SequenceParameterSetVui* pSequenceParameterSetVui;
249+
StdVideoH264SpsFlags flags;
250+
StdVideoH264ProfileIdc profile_idc;
251+
StdVideoH264Level level_idc;
252+
uint8_t seq_parameter_set_id;
253+
StdVideoH264ChromaFormatIdc chroma_format_idc;
254+
uint8_t bit_depth_luma_minus8;
255+
uint8_t bit_depth_chroma_minus8;
256+
uint8_t log2_max_frame_num_minus4;
257+
StdVideoH264PocType pic_order_cnt_type;
258+
uint8_t log2_max_pic_order_cnt_lsb_minus4;
259+
int32_t offset_for_non_ref_pic;
260+
int32_t offset_for_top_to_bottom_field;
261+
uint8_t num_ref_frames_in_pic_order_cnt_cycle;
262+
uint8_t max_num_ref_frames;
263+
uint32_t pic_width_in_mbs_minus1;
264+
uint32_t pic_height_in_map_units_minus1;
265+
uint32_t frame_crop_left_offset;
266+
uint32_t frame_crop_right_offset;
267+
uint32_t frame_crop_top_offset;
268+
uint32_t frame_crop_bottom_offset;
269+
const int32_t* pOffsetForRefFrame;
270+
const StdVideoH264ScalingLists* pScalingLists;
271+
const StdVideoH264SequenceParameterSetVui* pSequenceParameterSetVui;
275272
} StdVideoH264SequenceParameterSet;
276273

277274
typedef struct StdVideoH264PpsFlags {
@@ -287,17 +284,17 @@ typedef struct StdVideoH264PpsFlags {
287284
} StdVideoH264PpsFlags;
288285

289286
typedef struct StdVideoH264PictureParameterSet {
290-
uint8_t seq_parameter_set_id;
291-
uint8_t pic_parameter_set_id;
292-
uint8_t num_ref_idx_l0_default_active_minus1;
293-
uint8_t num_ref_idx_l1_default_active_minus1;
294-
StdVideoH264WeightedBipredIdc weighted_bipred_idc;
295-
int8_t pic_init_qp_minus26;
296-
int8_t pic_init_qs_minus26;
297-
int8_t chroma_qp_index_offset;
298-
int8_t second_chroma_qp_index_offset;
299-
StdVideoH264PpsFlags flags;
300-
StdVideoH264ScalingLists* pScalingLists;
287+
StdVideoH264PpsFlags flags;
288+
uint8_t seq_parameter_set_id;
289+
uint8_t pic_parameter_set_id;
290+
uint8_t num_ref_idx_l0_default_active_minus1;
291+
uint8_t num_ref_idx_l1_default_active_minus1;
292+
StdVideoH264WeightedBipredIdc weighted_bipred_idc;
293+
int8_t pic_init_qp_minus26;
294+
int8_t pic_init_qs_minus26;
295+
int8_t chroma_qp_index_offset;
296+
int8_t second_chroma_qp_index_offset;
297+
const StdVideoH264ScalingLists* pScalingLists;
301298
} StdVideoH264PictureParameterSet;
302299

303300

‎resources/headers/1.3.208/vk_video/vulkan_video_codec_h264std_decode.h renamed to ‎resources/headers/1.3.209/vk_video/vulkan_video_codec_h264std_decode.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,13 @@ extern "C" {
2020

2121

2222
#define vulkan_video_codec_h264std_decode 1
23+
// Vulkan 0.9 provisional Vulkan video H.264 decode std specification version number
24+
#define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_API_VERSION_0_9_6 VK_MAKE_VIDEO_STD_VERSION(0, 9, 6) // Patch version should always be set to 0
25+
2326
#define STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE 2
2427
#define STD_VIDEO_DECODE_H264_MVC_REF_LIST_SIZE 15
28+
#define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_API_VERSION_0_9_6
29+
#define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h264_decode"
2530

2631
typedef enum StdVideoDecodeH264FieldOrderCount {
2732
STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_TOP = 0,
@@ -39,27 +44,27 @@ typedef struct StdVideoDecodeH264PictureInfoFlags {
3944
} StdVideoDecodeH264PictureInfoFlags;
4045

4146
typedef struct StdVideoDecodeH264PictureInfo {
47+
StdVideoDecodeH264PictureInfoFlags flags;
4248
uint8_t seq_parameter_set_id;
4349
uint8_t pic_parameter_set_id;
4450
uint16_t reserved;
4551
uint16_t frame_num;
4652
uint16_t idr_pic_id;
4753
int32_t PicOrderCnt[STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE];
48-
StdVideoDecodeH264PictureInfoFlags flags;
4954
} StdVideoDecodeH264PictureInfo;
5055

5156
typedef struct StdVideoDecodeH264ReferenceInfoFlags {
5257
uint32_t top_field_flag : 1;
5358
uint32_t bottom_field_flag : 1;
54-
uint32_t is_long_term : 1;
59+
uint32_t used_for_long_term_reference : 1;
5560
uint32_t is_non_existing : 1;
5661
} StdVideoDecodeH264ReferenceInfoFlags;
5762

5863
typedef struct StdVideoDecodeH264ReferenceInfo {
64+
StdVideoDecodeH264ReferenceInfoFlags flags;
5965
uint16_t FrameNum;
6066
uint16_t reserved;
6167
int32_t PicOrderCnt[2];
62-
StdVideoDecodeH264ReferenceInfoFlags flags;
6368
} StdVideoDecodeH264ReferenceInfo;
6469

6570
typedef struct StdVideoDecodeH264MvcElementFlags {
@@ -85,9 +90,9 @@ typedef struct StdVideoDecodeH264MvcElement {
8590
} StdVideoDecodeH264MvcElement;
8691

8792
typedef struct StdVideoDecodeH264Mvc {
88-
uint32_t viewId0;
89-
uint32_t mvcElementCount;
90-
StdVideoDecodeH264MvcElement* pMvcElements;
93+
uint32_t viewId0;
94+
uint32_t mvcElementCount;
95+
const StdVideoDecodeH264MvcElement* pMvcElements;
9196
} StdVideoDecodeH264Mvc;
9297

9398

‎resources/headers/1.3.208/vk_video/vulkan_video_codec_h264std_encode.h renamed to ‎resources/headers/1.3.209/vk_video/vulkan_video_codec_h264std_encode.h

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,32 @@ extern "C" {
2020

2121

2222
#define vulkan_video_codec_h264std_encode 1
23+
// Vulkan 0.9 provisional Vulkan video H.264 encode std specification version number
24+
#define VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_API_VERSION_0_9_6 VK_MAKE_VIDEO_STD_VERSION(0, 9, 6) // Patch version should always be set to 0
25+
26+
#define VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_API_VERSION_0_9_6
27+
#define VK_STD_VULKAN_VIDEO_CODEC_H264_ENCODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h264_encode"
28+
typedef struct StdVideoEncodeH264WeightTableFlags {
29+
uint32_t luma_weight_l0_flag;
30+
uint32_t chroma_weight_l0_flag;
31+
uint32_t luma_weight_l1_flag;
32+
uint32_t chroma_weight_l1_flag;
33+
} StdVideoEncodeH264WeightTableFlags;
34+
35+
typedef struct StdVideoEncodeH264WeightTable {
36+
StdVideoEncodeH264WeightTableFlags flags;
37+
uint8_t luma_log2_weight_denom;
38+
uint8_t chroma_log2_weight_denom;
39+
int8_t luma_weight_l0[STD_VIDEO_H264_MAX_NUM_LIST_REF];
40+
int8_t luma_offset_l0[STD_VIDEO_H264_MAX_NUM_LIST_REF];
41+
int8_t chroma_weight_l0[STD_VIDEO_H264_MAX_NUM_LIST_REF][STD_VIDEO_H264_MAX_CHROMA_PLANES];
42+
int8_t chroma_offset_l0[STD_VIDEO_H264_MAX_NUM_LIST_REF][STD_VIDEO_H264_MAX_CHROMA_PLANES];
43+
int8_t luma_weight_l1[STD_VIDEO_H264_MAX_NUM_LIST_REF];
44+
int8_t luma_offset_l1[STD_VIDEO_H264_MAX_NUM_LIST_REF];
45+
int8_t chroma_weight_l1[STD_VIDEO_H264_MAX_NUM_LIST_REF][STD_VIDEO_H264_MAX_CHROMA_PLANES];
46+
int8_t chroma_offset_l1[STD_VIDEO_H264_MAX_NUM_LIST_REF][STD_VIDEO_H264_MAX_CHROMA_PLANES];
47+
} StdVideoEncodeH264WeightTable;
48+
2349
typedef struct StdVideoEncodeH264SliceHeaderFlags {
2450
uint32_t direct_spatial_mv_pred_flag : 1;
2551
uint32_t num_ref_idx_active_override_flag : 1;
@@ -31,11 +57,11 @@ typedef struct StdVideoEncodeH264SliceHeaderFlags {
3157
typedef struct StdVideoEncodeH264PictureInfoFlags {
3258
uint32_t idr_flag : 1;
3359
uint32_t is_reference_flag : 1;
34-
uint32_t long_term_reference_flag : 1;
60+
uint32_t used_for_long_term_reference : 1;
3561
} StdVideoEncodeH264PictureInfoFlags;
3662

3763
typedef struct StdVideoEncodeH264ReferenceInfoFlags {
38-
uint32_t is_long_term : 1;
64+
uint32_t used_for_long_term_reference : 1;
3965
} StdVideoEncodeH264ReferenceInfoFlags;
4066

4167
typedef struct StdVideoEncodeH264RefMgmtFlags {
@@ -58,17 +84,19 @@ typedef struct StdVideoEncodeH264RefPicMarkingEntry {
5884
} StdVideoEncodeH264RefPicMarkingEntry;
5985

6086
typedef struct StdVideoEncodeH264RefMemMgmtCtrlOperations {
61-
StdVideoEncodeH264RefMgmtFlags flags;
62-
uint8_t refList0ModOpCount;
63-
StdVideoEncodeH264RefListModEntry* pRefList0ModOperations;
64-
uint8_t refList1ModOpCount;
65-
StdVideoEncodeH264RefListModEntry* pRefList1ModOperations;
66-
uint8_t refPicMarkingOpCount;
67-
StdVideoEncodeH264RefPicMarkingEntry* pRefPicMarkingOperations;
87+
StdVideoEncodeH264RefMgmtFlags flags;
88+
uint8_t refList0ModOpCount;
89+
const StdVideoEncodeH264RefListModEntry* pRefList0ModOperations;
90+
uint8_t refList1ModOpCount;
91+
const StdVideoEncodeH264RefListModEntry* pRefList1ModOperations;
92+
uint8_t refPicMarkingOpCount;
93+
const StdVideoEncodeH264RefPicMarkingEntry* pRefPicMarkingOperations;
6894
} StdVideoEncodeH264RefMemMgmtCtrlOperations;
6995

7096
typedef struct StdVideoEncodeH264PictureInfo {
7197
StdVideoEncodeH264PictureInfoFlags flags;
98+
uint8_t seq_parameter_set_id;
99+
uint8_t pic_parameter_set_id;
72100
StdVideoH264PictureType pictureType;
73101
uint32_t frame_num;
74102
int32_t PicOrderCnt;
@@ -86,15 +114,14 @@ typedef struct StdVideoEncodeH264SliceHeader {
86114
StdVideoEncodeH264SliceHeaderFlags flags;
87115
uint32_t first_mb_in_slice;
88116
StdVideoH264SliceType slice_type;
89-
uint8_t seq_parameter_set_id;
90-
uint8_t pic_parameter_set_id;
91117
uint16_t idr_pic_id;
92118
uint8_t num_ref_idx_l0_active_minus1;
93119
uint8_t num_ref_idx_l1_active_minus1;
94120
StdVideoH264CabacInitIdc cabac_init_idc;
95121
StdVideoH264DisableDeblockingFilterIdc disable_deblocking_filter_idc;
96122
int8_t slice_alpha_c0_offset_div2;
97123
int8_t slice_beta_offset_div2;
124+
const StdVideoEncodeH264WeightTable* pWeightTable;
98125
} StdVideoEncodeH264SliceHeader;
99126

100127

0 commit comments

Comments
 (0)