<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5ad37678d0e9a3274a79bdb95b9b34815cedf418">https://github.com/macports/macports-ports/commit/5ad37678d0e9a3274a79bdb95b9b34815cedf418</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5ad37678d0e9a3274a79bdb95b9b34815cedf418
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Apr 11 21:19:32 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg6: fix build with new vulkan-headers
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69678
</span>---
multimedia/ffmpeg6/Portfile | 5 +-
multimedia/ffmpeg6/files/patch-fix-vulkan.diff | 1324 ++++++++++++++++++++++++
2 files changed, 1328 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg6/Portfile b/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d48d07ebe9f..308085c34fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ name ffmpeg6
</span> set my_name ffmpeg
version 6.1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> epoch 0
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,6 +113,9 @@ patchfiles-append patch-libavcodec-librsvgdec.diff
</span> # Remove once upstream has included these in the next release
patchfiles-append patch-issue-10695.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/69678
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-vulkan.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg6/files/patch-fix-vulkan.diff b/multimedia/ffmpeg6/files/patch-fix-vulkan.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4712aaeab1d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg6/files/patch-fix-vulkan.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,1324 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=10647
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/Makefile.orig 2023-12-31 00:07:26 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1284,7 +1284,6 @@ SKIPHEADERS += %_tablegen.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aacenc_quantization.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aacenc_quantization_misc.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitstream_template.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vulkan_video_codec_av1std.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(ARCH)/vpx_arith.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIPHEADERS-$(CONFIG_AMF) += amfenc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1306,7 +1305,7 @@ SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/cbs_av1.h.orig 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/cbs_av1.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -198,6 +198,7 @@ typedef struct AV1RawFrameHeader {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t refresh_frame_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t allow_intrabc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t ref_order_hint[AV1_NUM_REF_FRAMES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint8_t ref_frame_sign_bias[AV1_NUM_REF_FRAMES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t frame_refs_short_signaling;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t last_frame_idx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t golden_frame_idx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/cbs_av1_syntax_template.c.orig 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/cbs_av1_syntax_template.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1572,6 +1572,16 @@ static int FUNC(uncompressed_header)(CodedBitstreamCon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!frame_is_intra) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (seq->enable_order_hint) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int idx = current->ref_frame_idx[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int hint = current->ref_order_hint[idx];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ current->ref_frame_sign_bias[i] = cbs_av1_get_relative_dist(seq, hint,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ priv->order_hint) > 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ infer(ref_frame_sign_bias[i], 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Derive reference frame sign biases.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/vulkan_av1.c.orig 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/vulkan_av1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,18 +35,33 @@ typedef struct AV1VulkanDecodePicture {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *Can be removed once no longer needed, and threading can be enabled. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFVulkanDecodeContext *dec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESATile tiles[MAX_TILES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESATileList tile_list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const uint32_t *tile_offsets;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t tile_count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t tile_offsets_s[MAX_TILES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t tile_sizes[MAX_TILES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const uint32_t *tile_offsets;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Current picture */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1DpbSlotInfoMESA vkav1_ref;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAFrameHeader av1_frame_header;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1PictureInfoMESA av1_pic_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoDecodeAV1ReferenceInfo std_ref;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VkVideoDecodeAV1DpbSlotInfoKHR vkav1_ref;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t width_in_sbs_minus1[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t height_in_sbs_minus1[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t mi_col_starts[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint16_t mi_row_starts[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1TileInfo tile_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1Quantization quantization;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1Segmentation segmentation;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1LoopFilter loop_filter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1CDEF cdef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1LoopRestoration loop_restoration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1GlobalMotion global_motion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1FilmGrain film_grain;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoDecodeAV1PictureInfo std_pic_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VkVideoDecodeAV1PictureInfoKHR av1_pic_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Picture refs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const AV1Frame *ref_src [AV1_NUM_REF_FRAMES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1DpbSlotInfoMESA vkav1_refs[AV1_NUM_REF_FRAMES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoDecodeAV1ReferenceInfo std_ref_info[AV1_NUM_REF_FRAMES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VkVideoDecodeAV1DpbSlotInfoKHR vkav1_refs[AV1_NUM_REF_FRAMES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t frame_id_set;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t frame_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,9 +70,9 @@ static int vk_av1_fill_pict(AVCodecContext *avctx, con
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vk_av1_fill_pict(AVCodecContext *avctx, const AV1Frame **ref_src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoReferenceSlotInfoKHR *ref_slot, /* Main structure */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoPictureResourceInfoKHR *ref, /* Goes in ^ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1DpbSlotInfoMESA *vkav1_ref, /* Goes in ^ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const AV1Frame *pic, int is_current, int has_grain,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int dpb_slot_index)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoDecodeAV1ReferenceInfo *vkav1_std_ref,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VkVideoDecodeAV1DpbSlotInfoKHR *vkav1_ref, /* Goes in ^ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const AV1Frame *pic, int is_current, int has_grain)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AV1VulkanDecodePicture *hp = pic->hwaccel_picture_private;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,31 +83,48 @@ static int vk_av1_fill_pict(AVCodecContext *avctx, con
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (err < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *vkav1_ref = (VkVideoDecodeAV1DpbSlotInfoMESA) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_MESA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .frameIdx = hp->frame_id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *vkav1_std_ref = (StdVideoDecodeAV1ReferenceInfo) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .flags = (StdVideoDecodeAV1ReferenceInfoFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .segmentation_enabled = pic->raw_frame_header->segmentation_enabled,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .frame_type = pic->raw_frame_header->frame_type,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .OrderHint = pic->raw_frame_header->order_hint,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int i = 0; i < (STD_VIDEO_AV1_NUM_REF_FRAMES - 1); i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int hint_idx = pic->raw_frame_header->ref_frame_idx[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int hint = pic->raw_frame_header->ref_order_hint[hint_idx];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vkav1_std_ref->SavedOrderHints[AV1_REF_FRAME_LAST + i] = hint; // not sure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *vkav1_ref = (VkVideoDecodeAV1DpbSlotInfoKHR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pStdReferenceInfo = vkav1_std_ref,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (unsigned i = 0; i < 7; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int idx = pic->raw_frame_header->ref_frame_idx[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vkav1_ref->ref_order_hint[i] = pic->raw_frame_header->ref_order_hint[idx];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vkav1_std_ref->SavedOrderHints[i] = pic->raw_frame_header->ref_order_hint[idx];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vkav1_ref->disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vkav1_std_ref->flags.disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vkav1_std_ref->flags.segmentation_enabled = pic->raw_frame_header->segmentation_enabled;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vkav1_std_ref->frame_type = pic->raw_frame_header->frame_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *ref = (VkVideoPictureResourceInfoKHR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .codedOffset = (VkOffset2D){ 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .codedExtent = (VkExtent2D){ pic->f->width, pic->f->height },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .baseArrayLayer = ((has_grain || dec->dedicated_dpb) && dec->layered_dpb) ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dpb_slot_index : 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hp->frame_id : 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .imageViewBinding = vkpic->img_view_ref,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *ref_slot = (VkVideoReferenceSlotInfoKHR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .sType = VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .pNext = vkav1_ref,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .slotIndex = dpb_slot_index,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .slotIndex = hp->frame_id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .pPictureResource = ref,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,15 +142,37 @@ static int vk_av1_create_params(AVCodecContext *avctx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const AV1RawSequenceHeader *seq = s->raw_seq;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESASequenceHeader av1_sequence_header;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1SessionParametersAddInfoMESA av1_params_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1SessionParametersCreateInfoMESA av1_params;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1SequenceHeader av1_sequence_header;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1TimingInfo av1_timing_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1ColorConfig av1_color_config;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VkVideoDecodeAV1SessionParametersCreateInfoKHR av1_params;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoSessionParametersCreateInfoKHR session_params_create;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- av1_sequence_header = (StdVideoAV1MESASequenceHeader) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags = (StdVideoAV1MESASequenceHeaderFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av1_timing_info = (StdVideoAV1TimingInfo) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .flags = (StdVideoAV1TimingInfoFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .equal_picture_interval = seq->timing_info.equal_picture_interval,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .num_units_in_display_tick = seq->timing_info.num_units_in_display_tick,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .time_scale = seq->timing_info.time_scale,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .num_ticks_per_picture_minus_1 = seq->timing_info.num_ticks_per_picture_minus_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av1_color_config = (StdVideoAV1ColorConfig) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .flags = (StdVideoAV1ColorConfigFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .mono_chrome = seq->color_config.mono_chrome,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .color_range = seq->color_config.color_range,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .separate_uv_delta_q = seq->color_config.separate_uv_delta_q,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .BitDepth = seq->color_config.twelve_bit ? 12 :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ seq->color_config.high_bitdepth ? 10 : 8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .subsampling_x = seq->color_config.subsampling_x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .subsampling_y = seq->color_config.subsampling_y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av1_sequence_header = (StdVideoAV1SequenceHeader) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .flags = (StdVideoAV1SequenceHeaderFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .still_picture = seq->still_picture,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .reduced_still_picture_header = seq->reduced_still_picture_header,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .use_128x128_superblock = seq->use_128x128_superblock,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,35 +201,14 @@ static int vk_av1_create_params(AVCodecContext *avctx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .delta_frame_id_length_minus_2 = seq->delta_frame_id_length_minus_2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .additional_frame_id_length_minus_1 = seq->additional_frame_id_length_minus_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .order_hint_bits_minus_1 = seq->order_hint_bits_minus_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .timing_info = (StdVideoAV1MESATimingInfo) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags = (StdVideoAV1MESATimingInfoFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .equal_picture_interval = seq->timing_info.equal_picture_interval,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .num_units_in_display_tick = seq->timing_info.num_units_in_display_tick,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .time_scale = seq->timing_info.time_scale,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .num_ticks_per_picture_minus_1 = seq->timing_info.num_ticks_per_picture_minus_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .color_config = (StdVideoAV1MESAColorConfig) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags = (StdVideoAV1MESAColorConfigFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .mono_chrome = seq->color_config.mono_chrome,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .color_range = seq->color_config.color_range,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .separate_uv_delta_q = seq->color_config.separate_uv_delta_q,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .bit_depth = seq->color_config.twelve_bit ? 12 :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- seq->color_config.high_bitdepth ? 10 : 8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .subsampling_x = seq->color_config.subsampling_x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .subsampling_y = seq->color_config.subsampling_y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pTimingInfo = &av1_timing_info,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pColorConfig = &av1_color_config,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- av1_params_info = (VkVideoDecodeAV1SessionParametersAddInfoMESA) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_ADD_INFO_MESA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .sequence_header = &av1_sequence_header,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av1_params = (VkVideoDecodeAV1SessionParametersCreateInfoKHR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pStdSequenceHeader = &av1_sequence_header,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- av1_params = (VkVideoDecodeAV1SessionParametersCreateInfoMESA) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .pParametersAddInfo = &av1_params_info,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ session_params_create = (VkVideoSessionParametersCreateInfoKHR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .pNext = &av1_params,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -208,6 +241,11 @@ static int vk_av1_start_frame(AVCodecContext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const AV1RawFilmGrainParams *film_grain = &s->cur_frame.film_grain;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ film_grain->apply_grain;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StdVideoAV1FrameRestorationType remap_lr_type[4] = { STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_NONE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SWITCHABLE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_WIENER,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SGRPROJ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int uses_lr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!dec->session_params) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = vk_av1_create_params(avctx, &dec->session_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,29 +273,37 @@ static int vk_av1_start_frame(AVCodecContext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = vk_av1_fill_pict(avctx, &ap->ref_src[i], &vp->ref_slots[i],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- &vp->refs[i], &ap->vkav1_refs[i],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ref_frame, 0, 0, i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ &vp->refs[i], &ap->std_ref_info[i], &ap->vkav1_refs[i],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ref_frame, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (err < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Really not sure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->std_ref_info[i].RefFrameSignBias = pic->raw_frame_header->ref_frame_sign_bias[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ref_count++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = vk_av1_fill_pict(avctx, NULL, &vp->ref_slot, &vp->ref,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ &ap->std_ref,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &ap->vkav1_ref,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pic, 1, apply_grain, 8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pic, 1, apply_grain);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (err < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->tile_list.nb_tiles = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->tile_list.tile_list = ap->tiles;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->tile_count = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_pic_info = (VkVideoDecodeAV1PictureInfoMESA) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_MESA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .frame_header = &ap->av1_frame_header,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .tile_list = &ap->tile_list,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->av1_pic_info = (VkVideoDecodeAV1PictureInfoKHR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pStdPictureInfo = &ap->std_pic_info,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .tileCount = ap->tile_count,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pTileOffsets = ap->tile_offsets_s,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pTileSizes = ap->tile_sizes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int i = 0; i < STD_VIDEO_AV1_REFS_PER_FRAME; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->av1_pic_info.referenceNameSlotIndices[i] = vp->ref_slots[frame_header->ref_frame_idx[i]].slotIndex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vp->decode_info = (VkVideoDecodeInfoKHR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .pNext = &ap->av1_pic_info,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -274,9 +320,94 @@ static int vk_av1_start_frame(AVCodecContext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->tile_info = (StdVideoAV1TileInfo) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .flags = (StdVideoAV1TileInfoFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .uniform_tile_spacing_flag = frame_header->uniform_tile_spacing_flag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .TileCols = frame_header->tile_cols,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .TileRows = frame_header->tile_rows,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .context_update_tile_id = frame_header->context_update_tile_id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .tile_size_bytes_minus_1 = frame_header->tile_size_bytes_minus1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pWidthInSbsMinus1 = ap->width_in_sbs_minus1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pHeightInSbsMinus1 = ap->height_in_sbs_minus1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pMiColStarts = ap->mi_col_starts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pMiRowStarts = ap->mi_row_starts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->quantization = (StdVideoAV1Quantization) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .flags.using_qmatrix = frame_header->using_qmatrix,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .flags.diff_uv_delta = frame_header->diff_uv_delta,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .base_q_idx = frame_header->base_q_idx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .DeltaQYDc = frame_header->delta_q_y_dc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .DeltaQUDc = frame_header->delta_q_u_dc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .DeltaQUAc = frame_header->delta_q_u_ac,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .DeltaQVDc = frame_header->delta_q_v_dc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .DeltaQVAc = frame_header->delta_q_v_ac,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .qm_y = frame_header->qm_y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .qm_u = frame_header->qm_u,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .qm_v = frame_header->qm_v,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int i = 0; i < STD_VIDEO_AV1_MAX_SEGMENTS; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int j = 0; j < STD_VIDEO_AV1_SEG_LVL_MAX; j++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->segmentation.FeatureEnabled[i] |= frame_header->feature_enabled[i][j] << j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->segmentation.FeatureData[i][j] = frame_header->feature_value[i][j];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->loop_filter = (StdVideoAV1LoopFilter) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .flags = (StdVideoAV1LoopFilterFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .loop_filter_delta_enabled = frame_header->loop_filter_delta_enabled,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .loop_filter_delta_update = frame_header->loop_filter_delta_update,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .loop_filter_sharpness = frame_header->loop_filter_sharpness,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int i = 0; i < STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->loop_filter.loop_filter_level[i] = frame_header->loop_filter_level[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int i = 0; i < STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->loop_filter.loop_filter_mode_deltas[i] = frame_header->loop_filter_mode_deltas[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->cdef = (StdVideoAV1CDEF) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .cdef_damping_minus_3 = frame_header->cdef_damping_minus_3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .cdef_bits = frame_header->cdef_bits,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uses_lr = frame_header->lr_type[0] || frame_header->lr_type[1] || frame_header->lr_type[2],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->loop_restoration = (StdVideoAV1LoopRestoration) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .FrameRestorationType[0] = remap_lr_type[frame_header->lr_type[0]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .FrameRestorationType[1] = remap_lr_type[frame_header->lr_type[1]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .FrameRestorationType[2] = remap_lr_type[frame_header->lr_type[2]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .LoopRestorationSize[0] = 1 + frame_header->lr_unit_shift,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .LoopRestorationSize[1] = 1 + frame_header->lr_unit_shift - frame_header->lr_uv_shift,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .LoopRestorationSize[2] = 1 + frame_header->lr_unit_shift - frame_header->lr_uv_shift,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain = (StdVideoAV1FilmGrain) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .flags = (StdVideoAV1FilmGrainFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .overlap_flag = film_grain->overlap_flag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .clip_to_restricted_range = film_grain->clip_to_restricted_range,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .grain_scaling_minus_8 = film_grain->grain_scaling_minus_8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .ar_coeff_lag = film_grain->ar_coeff_lag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .ar_coeff_shift_minus_6 = film_grain->ar_coeff_shift_minus_6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .grain_scale_shift = film_grain->grain_scale_shift,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .grain_seed = film_grain->grain_seed,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .num_y_points = film_grain->num_y_points,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .num_cb_points = film_grain->num_cb_points,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .num_cr_points = film_grain->num_cr_points,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .cb_mult = film_grain->cb_mult,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .cb_luma_mult = film_grain->cb_luma_mult,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .cb_offset = film_grain->cb_offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .cr_mult = film_grain->cr_mult,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .cr_luma_mult = film_grain->cr_luma_mult,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .cr_offset = film_grain->cr_offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Setup frame header */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header = (StdVideoAV1MESAFrameHeader) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags = (StdVideoAV1MESAFrameHeaderFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->std_pic_info = (StdVideoDecodeAV1PictureInfo) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .flags = (StdVideoDecodeAV1PictureInfoFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .error_resilient_mode = frame_header->error_resilient_mode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .disable_cdf_update = frame_header->disable_cdf_update,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .use_superres = frame_header->use_superres,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -297,171 +428,87 @@ static int vk_av1_start_frame(AVCodecContext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .reference_select = frame_header->reference_select,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .skip_mode_present = frame_header->skip_mode_present,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .delta_q_present = frame_header->delta_q_present,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .delta_lf_present = frame_header->delta_lf_present,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .delta_lf_multi = frame_header->delta_lf_multi,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .segmentation_enabled = frame_header->segmentation_enabled,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .segmentation_update_map = frame_header->segmentation_update_map,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .segmentation_temporal_update = frame_header->segmentation_temporal_update,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .segmentation_update_data = frame_header->segmentation_update_data,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .UsesLr = uses_lr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .apply_grain = apply_grain,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .frame_to_show_map_idx = frame_header->frame_to_show_map_idx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .frame_presentation_time = frame_header->frame_presentation_time,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .display_frame_id = frame_header->display_frame_id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .frame_type = frame_header->frame_type,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .current_frame_id = frame_header->current_frame_id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .order_hint = frame_header->order_hint,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .OrderHint = frame_header->order_hint,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .primary_ref_frame = frame_header->primary_ref_frame,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .frame_width_minus_1 = frame_header->frame_width_minus_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .frame_height_minus_1 = frame_header->frame_height_minus_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .coded_denom = frame_header->coded_denom,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .render_width_minus_1 = frame_header->render_width_minus_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .render_height_minus_1 = frame_header->render_height_minus_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .refresh_frame_flags = frame_header->refresh_frame_flags,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .interpolation_filter = frame_header->interpolation_filter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .tx_mode = frame_header->tx_mode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .tiling = (StdVideoAV1MESATileInfo) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags = (StdVideoAV1MESATileInfoFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .uniform_tile_spacing_flag = frame_header->uniform_tile_spacing_flag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .tile_cols = frame_header->tile_cols,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .tile_rows = frame_header->tile_rows,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .context_update_tile_id = frame_header->context_update_tile_id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .tile_size_bytes_minus1 = frame_header->tile_size_bytes_minus1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .quantization = (StdVideoAV1MESAQuantization) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags.using_qmatrix = frame_header->using_qmatrix,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .base_q_idx = frame_header->base_q_idx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_q_y_dc = frame_header->delta_q_y_dc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .diff_uv_delta = frame_header->diff_uv_delta,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_q_u_dc = frame_header->delta_q_u_dc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_q_u_ac = frame_header->delta_q_u_ac,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_q_v_dc = frame_header->delta_q_v_dc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_q_v_ac = frame_header->delta_q_v_ac,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .qm_y = frame_header->qm_y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .qm_u = frame_header->qm_u,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .qm_v = frame_header->qm_v,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_q = (StdVideoAV1MESADeltaQ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags = (StdVideoAV1MESADeltaQFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_lf_present = frame_header->delta_lf_present,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_lf_multi = frame_header->delta_lf_multi,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_q_res = frame_header->delta_q_res,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_lf_res = frame_header->delta_lf_res,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .loop_filter = (StdVideoAV1MESALoopFilter) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags = (StdVideoAV1MESALoopFilterFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_enabled = frame_header->loop_filter_delta_enabled,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .delta_update = frame_header->loop_filter_delta_update,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .level = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- frame_header->loop_filter_level[0], frame_header->loop_filter_level[1],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- frame_header->loop_filter_level[2], frame_header->loop_filter_level[3],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .sharpness = frame_header->loop_filter_sharpness,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .mode_deltas = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- frame_header->loop_filter_mode_deltas[0], frame_header->loop_filter_mode_deltas[1],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .cdef = (StdVideoAV1MESACDEF) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .damping_minus_3 = frame_header->cdef_damping_minus_3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .bits = frame_header->cdef_bits,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .lr = (StdVideoAV1MESALoopRestoration) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .lr_unit_shift = frame_header->lr_unit_shift,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .lr_uv_shift = frame_header->lr_uv_shift,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .lr_type = { frame_header->lr_type[0], frame_header->lr_type[1], frame_header->lr_type[2] },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .segmentation = (StdVideoAV1MESASegmentation) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags = (StdVideoAV1MESASegmentationFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .enabled = frame_header->segmentation_enabled,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .update_map = frame_header->segmentation_update_map,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .temporal_update = frame_header->segmentation_temporal_update,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .update_data = frame_header->segmentation_update_data,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .film_grain = (StdVideoAV1MESAFilmGrainParameters) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags = (StdVideoAV1MESAFilmGrainFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .apply_grain = apply_grain,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .overlap_flag = film_grain->overlap_flag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .clip_to_restricted_range = film_grain->clip_to_restricted_range,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .grain_scaling_minus_8 = film_grain->grain_scaling_minus_8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .ar_coeff_lag = film_grain->ar_coeff_lag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .ar_coeff_shift_minus_6 = film_grain->ar_coeff_shift_minus_6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .grain_scale_shift = film_grain->grain_scale_shift,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .grain_seed = film_grain->grain_seed,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .num_y_points = film_grain->num_y_points,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .num_cb_points = film_grain->num_cb_points,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .num_cr_points = film_grain->num_cr_points,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .cb_mult = film_grain->cb_mult,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .cb_luma_mult = film_grain->cb_luma_mult,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .cb_offset = film_grain->cb_offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .cr_mult = film_grain->cr_mult,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .cr_luma_mult = film_grain->cr_luma_mult,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .cr_offset = film_grain->cr_offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .TxMode = frame_header->tx_mode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .delta_q_res = frame_header->delta_q_res,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .delta_lf_res = frame_header->delta_lf_res,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .SkipModeFrame[0] = s->cur_frame.skip_mode_frame_idx[0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .SkipModeFrame[1] = s->cur_frame.skip_mode_frame_idx[1],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .coded_denom = frame_header->coded_denom,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pTileInfo = &ap->tile_info,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pQuantization = &ap->quantization,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pSegmentation = &ap->segmentation,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pLoopFilter = &ap->loop_filter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pCDEF = &ap->cdef,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pLoopRestoration = &ap->loop_restoration,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pGlobalMotion = &ap->global_motion,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pFilmGrain = apply_grain ? &ap->film_grain : NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < 64; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.tiling.width_in_sbs_minus_1[i] = frame_header->width_in_sbs_minus_1[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.tiling.height_in_sbs_minus_1[i] = frame_header->height_in_sbs_minus_1[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.tiling.tile_start_col_sb[i] = frame_header->tile_start_col_sb[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.tiling.tile_start_row_sb[i] = frame_header->tile_start_row_sb[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->width_in_sbs_minus1[i] = frame_header->width_in_sbs_minus_1[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->height_in_sbs_minus1[i] = frame_header->height_in_sbs_minus_1[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->mi_col_starts[i] = frame_header->tile_start_col_sb[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->mi_row_starts[i] = frame_header->tile_start_row_sb[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < 8; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.segmentation.feature_enabled_bits[i] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (int j = 0; j < 8; j++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.segmentation.feature_enabled_bits[i] |= (frame_header->feature_enabled[i][j] << j);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.segmentation.feature_data[i][j] = frame_header->feature_value[i][j];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->segmentation.FeatureEnabled[i] = 0x0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int j = 0; j < STD_VIDEO_AV1_SEG_LVL_MAX; j++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->segmentation.FeatureEnabled[i] |= (frame_header->feature_enabled[i][j] << j);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->segmentation.FeatureData[i][j] = frame_header->feature_value[i][j];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.loop_filter.ref_deltas[i] = frame_header->loop_filter_ref_deltas[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->loop_filter.loop_filter_ref_deltas[i] = frame_header->loop_filter_ref_deltas[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.cdef.y_pri_strength[i] = frame_header->cdef_y_pri_strength[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.cdef.y_sec_strength[i] = frame_header->cdef_y_sec_strength[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.cdef.uv_pri_strength[i] = frame_header->cdef_uv_pri_strength[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.cdef.uv_sec_strength[i] = frame_header->cdef_uv_sec_strength[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->cdef.cdef_y_pri_strength[i] = frame_header->cdef_y_pri_strength[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->cdef.cdef_y_sec_strength[i] = frame_header->cdef_y_sec_strength[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->cdef.cdef_uv_pri_strength[i] = frame_header->cdef_uv_pri_strength[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->cdef.cdef_uv_sec_strength[i] = frame_header->cdef_uv_sec_strength[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.ref_order_hint[i] = frame_header->ref_order_hint[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.global_motion[i] = (StdVideoAV1MESAGlobalMotion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .flags = (StdVideoAV1MESAGlobalMotionFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .gm_invalid = s->cur_frame.gm_invalid[i],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .gm_type = s->cur_frame.gm_type[i],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .gm_params = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- s->cur_frame.gm_params[i][0], s->cur_frame.gm_params[i][1],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- s->cur_frame.gm_params[i][2], s->cur_frame.gm_params[i][3],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- s->cur_frame.gm_params[i][4], s->cur_frame.gm_params[i][5],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Reference frames */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->std_pic_info.OrderHints[i] = frame_header->ref_order_hint[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->global_motion.GmType[i] = s->cur_frame.gm_type[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int j = 0; j < STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS; j++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->global_motion.gm_params[i][j] = s->cur_frame.gm_params[i][j];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (int i = 0; i < 7; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.ref_frame_idx[i] = frame_header->ref_frame_idx[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.delta_frame_id_minus1[i] = frame_header->delta_frame_id_minus1[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_pic_info.skip_mode_frame_idx[0] = s->cur_frame.skip_mode_frame_idx[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_pic_info.skip_mode_frame_idx[1] = s->cur_frame.skip_mode_frame_idx[1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (apply_grain) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < 14; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.point_y_value[i] = film_grain->point_y_value[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.point_y_scaling[i] = film_grain->point_y_scaling[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.point_y_value[i] = film_grain->point_y_value[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.point_y_scaling[i] = film_grain->point_y_scaling[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < 10; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.point_cb_value[i] = film_grain->point_cb_value[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.point_cb_scaling[i] = film_grain->point_cb_scaling[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.point_cr_value[i] = film_grain->point_cr_value[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.point_cr_scaling[i] = film_grain->point_cr_scaling[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.point_cb_value[i] = film_grain->point_cb_value[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.point_cb_scaling[i] = film_grain->point_cb_scaling[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.point_cr_value[i] = film_grain->point_cr_value[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.point_cr_scaling[i] = film_grain->point_cr_scaling[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < 24; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.ar_coeffs_y_plus_128[i] = film_grain->ar_coeffs_y_plus_128[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.ar_coeffs_cb_plus_128[i] = film_grain->ar_coeffs_cb_plus_128[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.ar_coeffs_cr_plus_128[i] = film_grain->ar_coeffs_cr_plus_128[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.ar_coeffs_y_plus_128[i] = film_grain->ar_coeffs_y_plus_128[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.ar_coeffs_cb_plus_128[i] = film_grain->ar_coeffs_cb_plus_128[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.ar_coeffs_cr_plus_128[i] = film_grain->ar_coeffs_cr_plus_128[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.ar_coeffs_cb_plus_128[24] = film_grain->ar_coeffs_cb_plus_128[24];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->av1_frame_header.film_grain.ar_coeffs_cr_plus_128[24] = film_grain->ar_coeffs_cr_plus_128[24];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.ar_coeffs_cb_plus_128[24] = film_grain->ar_coeffs_cb_plus_128[24];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->film_grain.ar_coeffs_cr_plus_128[24] = film_grain->ar_coeffs_cr_plus_128[24];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Workaround for a spec issue. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -480,26 +527,22 @@ static int vk_av1_decode_slice(AVCodecContext *avctx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFVulkanDecodePicture *vp = &ap->vp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = s->tg_start; i <= s->tg_end; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->tiles[ap->tile_list.nb_tiles] = (StdVideoAV1MESATile) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .size = s->tile_group_info[i].tile_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .offset = s->tile_group_info[i].tile_offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .row = s->tile_group_info[i].tile_row,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .column = s->tile_group_info[i].tile_column,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .tg_start = s->tg_start,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .tg_end = s->tg_end,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->tile_offsets_s[ap->tile_count] = s->tile_group_info[i].tile_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->tile_sizes[ap->tile_count] = s->tile_group_info[i].tile_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = ff_vk_decode_add_slice(avctx, vp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data + s->tile_group_info[i].tile_offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s->tile_group_info[i].tile_size, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- &ap->tile_list.nb_tiles,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ &ap->tile_count,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &ap->tile_offsets);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (err < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ap->tiles[ap->tile_list.nb_tiles - 1].offset = ap->tile_offsets[ap->tile_list.nb_tiles - 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->tile_offsets_s[ap->tile_count - 1] = ap->tile_offsets[ap->tile_count - 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ap->av1_pic_info.tileCount = ap->tile_count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -513,7 +556,7 @@ static int vk_av1_end_frame(AVCodecContext *avctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFVulkanDecodePicture *rvp[AV1_NUM_REF_FRAMES] = { 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVFrame *rav[AV1_NUM_REF_FRAMES] = { 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!ap->tile_list.nb_tiles)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!ap->tile_count)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!dec->session_params) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -531,7 +574,7 @@ static int vk_av1_end_frame(AVCodecContext *avctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_log(avctx, AV_LOG_VERBOSE, "Decoding frame, %"SIZE_SPECIFIER" bytes, %i tiles\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vp->slices_size, ap->tile_list.nb_tiles);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vp->slices_size, ap->tile_count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ff_vk_decode_frame(avctx, pic->f, vp, rav, rvp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/vulkan_decode.c.orig 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/vulkan_decode.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@ static const VkVideoProfileInfoKHR *get_video_profile(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkStructureType profile_struct_type =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ codec_id == AV_CODEC_ID_H264 ? VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ codec_id == AV_CODEC_ID_HEVC ? VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- codec_id == AV_CODEC_ID_AV1 ? VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ codec_id == AV_CODEC_ID_AV1 ? VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ profile_list = ff_vk_find_struct(ctx->s.hwfc->create_pnext,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -663,7 +663,7 @@ static VkResult vulkan_setup_profile(AVCodecContext *a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const struct FFVkCodecMap *vk_codec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoDecodeH264CapabilitiesKHR *h264_caps,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoDecodeH265CapabilitiesKHR *h265_caps,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1CapabilitiesMESA *av1_caps,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VkVideoDecodeAV1CapabilitiesKHR *av1_caps,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoCapabilitiesKHR *caps,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoDecodeCapabilitiesKHR *dec_caps,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int cur_profile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -674,7 +674,7 @@ static VkResult vulkan_setup_profile(AVCodecContext *a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoDecodeH264ProfileInfoKHR *h264_profile = &prof->h264_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoDecodeH265ProfileInfoKHR *h265_profile = &prof->h265_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1ProfileInfoMESA *av1_profile = &prof->av1_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VkVideoDecodeAV1ProfileInfoKHR *av1_profile = &prof->av1_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->sw_pix_fmt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!desc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -702,8 +702,8 @@ static VkResult vulkan_setup_profile(AVCodecContext *a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (avctx->codec_id == AV_CODEC_ID_AV1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dec_caps->pNext = av1_caps;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ usage->pNext = av1_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- av1_profile->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- av1_profile->stdProfileIdc = cur_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av1_profile->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av1_profile->stdProfile = cur_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ usage->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -758,8 +758,8 @@ static int vulkan_decode_get_profile(AVCodecContext *a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoDecodeH265CapabilitiesKHR h265_caps = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1CapabilitiesMESA av1_caps = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_MESA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VkVideoDecodeAV1CapabilitiesKHR av1_caps = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkPhysicalDeviceVideoFormatInfoKHR fmt_info = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -782,7 +782,7 @@ static int vulkan_decode_get_profile(AVCodecContext *a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cur_profile = avctx->profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base_profile = avctx->codec_id == AV_CODEC_ID_H264 ? AV_PROFILE_H264_CONSTRAINED_BASELINE :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ avctx->codec_id == AV_CODEC_ID_H265 ? AV_PROFILE_HEVC_MAIN :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- avctx->codec_id == AV_CODEC_ID_AV1 ? STD_VIDEO_AV1_MESA_PROFILE_MAIN :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ avctx->codec_id == AV_CODEC_ID_AV1 ? STD_VIDEO_AV1_PROFILE_MAIN :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = vulkan_setup_profile(avctx, prof, hwctx, vk, vk_codec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -830,7 +830,7 @@ static int vulkan_decode_get_profile(AVCodecContext *a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max_level = avctx->codec_id == AV_CODEC_ID_H264 ? ff_vk_h264_level_to_av(h264_caps.maxLevelIdc) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ avctx->codec_id == AV_CODEC_ID_H265 ? ff_vk_h265_level_to_av(h265_caps.maxLevelIdc) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- avctx->codec_id == AV_CODEC_ID_AV1 ? av1_caps.maxLevelIdc :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ avctx->codec_id == AV_CODEC_ID_AV1 ? ff_vk_av1_level_to_av(av1_caps.maxLevel) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_log(avctx, AV_LOG_VERBOSE, "Decoder capabilities for %s profile \"%s\":\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -911,7 +911,7 @@ static int vulkan_decode_get_profile(AVCodecContext *a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* TODO: make dedicated_dpb tunable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dec->dedicated_dpb = !(dec_caps->flags & VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dec->layered_dpb = !(caps->flags & VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dec->external_fg = av1_caps.flags & VK_VIDEO_DECODE_AV1_CAPABILITY_EXTERNAL_FILM_GRAIN_MESA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // dec->external_fg = av1_caps.flags & VK_VIDEO_DECODE_AV1_CAPABILITY_EXTERNAL_FILM_GRAIN_KHR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dec->dedicated_dpb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmt_info.imageUsage = VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1118,8 +1118,8 @@ int ff_vk_decode_init(AVCodecContext *avctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoDecodeH265SessionParametersCreateInfoKHR h265_params = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1SessionParametersCreateInfoMESA av1_params = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VkVideoDecodeAV1SessionParametersCreateInfoKHR av1_params = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoSessionParametersCreateInfoKHR session_params_create = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/vulkan_decode.h.orig 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/vulkan_decode.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@ typedef struct FFVulkanDecodeProfileData {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct FFVulkanDecodeProfileData {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoDecodeH264ProfileInfoKHR h264_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoDecodeH265ProfileInfoKHR h265_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1ProfileInfoMESA av1_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VkVideoDecodeAV1ProfileInfoKHR av1_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoDecodeUsageInfoKHR usage;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoProfileInfoKHR profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkVideoProfileListInfoKHR profile_list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/vulkan_video.c.orig 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/vulkan_video.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@ const FFVkCodecMap ff_vk_codec_map[AV_CODEC_ID_FIRST_A
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_VK_EXT_VIDEO_DECODE_AV1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0x01000000 /* TODO fix this */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,6 +196,37 @@ int ff_vk_h265_level_to_av(StdVideoH265LevelIdc level)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case STD_VIDEO_H265_LEVEL_IDC_6_1: return 61;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case STD_VIDEO_H265_LEVEL_IDC_6_2: return 62;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int ff_vk_av1_level_to_av(StdVideoAV1Level level)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ switch (level) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_2_0: return 20;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_2_1: return 21;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_2_2: return 22;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_2_3: return 23;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_3_0: return 30;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_3_1: return 31;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_3_2: return 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_3_3: return 33;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_4_0: return 40;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_4_1: return 41;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_4_2: return 42;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_4_3: return 43;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_5_0: return 50;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_5_1: return 51;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_5_2: return 52;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_5_3: return 53;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_6_0: return 60;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_6_1: return 61;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_6_2: return 62;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_6_3: return 63;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_7_0: return 70;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_7_1: return 71;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_7_2: return 72;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case STD_VIDEO_AV1_LEVEL_7_3: return 73;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/vulkan_video.h.orig 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/vulkan_video.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,8 +23,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "vulkan.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vk_video/vulkan_video_codecs_common.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "vulkan_video_codec_av1std.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "vulkan_video_codec_av1std_decode.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CODEC_VER_MAJ(ver) (ver >> 22)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,6 +75,7 @@ int ff_vk_h265_level_to_av(StdVideoH265LevelIdc level)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ff_vk_h264_level_to_av(StdVideoH264LevelIdc level);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ff_vk_h265_level_to_av(StdVideoH265LevelIdc level);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int ff_vk_av1_level_to_av(StdVideoAV1Level level);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct FFVkVideoBuffer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFVkBuffer buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/vulkan_video_codec_av1std.h 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,403 +0,0 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Copyright 2023 Lynne
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2023 Dave Airlie
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Licensed under the Apache License, Version 2.0 (the "License");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * you may not use this file except in compliance with the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * You may obtain a copy of the License at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * http://www.apache.org/licenses/LICENSE-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Unless required by applicable law or agreed to in writing, software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * distributed under the License is distributed on an "AS IS" BASIS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * See the License for the specific language governing permissions and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * limitations under the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define vulkan_video_codec_av1std 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VK_MAKE_VIDEO_STD_VERSION(major, minor, patch) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_0_1_0 VK_MAKE_VIDEO_STD_VERSION(0, 1, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_0_1_0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_av1_decode"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef enum StdVideoAV1MESAProfile {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_PROFILE_MAIN = 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_PROFILE_HIGH = 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_PROFILE_PROFESSIONAL = 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAProfile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef enum StdVideoAV1MESALevel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_2_0 = 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_2_1 = 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_2_2 = 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_2_3 = 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_3_0 = 4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_3_1 = 5,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_3_2 = 6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_3_3 = 7,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_4_0 = 8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_4_1 = 9,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_4_2 = 10,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_4_3 = 11,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_5_0 = 12,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_5_1 = 13,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_5_2 = 14,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_5_3 = 15,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_6_0 = 16,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_6_1 = 17,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_6_2 = 18,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_6_3 = 19,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_7_0 = 20,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_7_1 = 21,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_7_2 = 22,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_7_3 = 23,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- STD_VIDEO_AV1_MESA_LEVEL_MAX = 31,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESALevel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAFilmGrainFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t apply_grain;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t chroma_scaling_from_luma;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t overlap_flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t clip_to_restricted_range;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAFilmGrainFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAFilmGrainParameters {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAFilmGrainFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t grain_scaling_minus_8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t ar_coeff_lag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t ar_coeff_shift_minus_6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t grain_scale_shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t grain_seed;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t num_y_points;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t point_y_value[14];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t point_y_scaling[14];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t num_cb_points;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t point_cb_value[10];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t point_cb_scaling[10];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t num_cr_points;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t point_cr_value[10];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t point_cr_scaling[10];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t ar_coeffs_y_plus_128[24];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t ar_coeffs_cb_plus_128[25];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t ar_coeffs_cr_plus_128[25];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t cb_mult;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t cb_luma_mult;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t cb_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t cr_mult;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t cr_luma_mult;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t cr_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAFilmGrainParameters;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAGlobalMotionFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t gm_invalid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAGlobalMotionFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAGlobalMotion {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAGlobalMotionFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t gm_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t gm_params[6];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAGlobalMotion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESALoopRestoration {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t lr_type[3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t lr_unit_shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t lr_uv_shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESALoopRestoration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESATileInfoFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t uniform_tile_spacing_flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESATileInfoFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESATileInfo {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESATileInfoFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t tile_cols;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t tile_rows;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t tile_start_col_sb[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t tile_start_row_sb[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t width_in_sbs_minus_1[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t height_in_sbs_minus_1[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t context_update_tile_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t tile_size_bytes_minus1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESATileInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAQuantizationFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t using_qmatrix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAQuantizationFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAQuantization {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAQuantizationFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t base_q_idx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t delta_q_y_dc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t diff_uv_delta;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t delta_q_u_dc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t delta_q_u_ac;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t delta_q_v_dc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t delta_q_v_ac;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t qm_y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t qm_u;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t qm_v;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAQuantization;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESACDEF {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t damping_minus_3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t y_pri_strength[8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t y_sec_strength[8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t uv_pri_strength[8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t uv_sec_strength[8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESACDEF;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESADeltaQFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t delta_lf_present;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t delta_lf_multi;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESADeltaQFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESADeltaQ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESADeltaQFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t delta_q_res;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t delta_lf_res;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESADeltaQ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESASegmentationFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enabled;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t update_map;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t temporal_update;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t update_data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESASegmentationFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESASegmentation {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESASegmentationFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t feature_enabled_bits[8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int16_t feature_data[8][8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESASegmentation;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESALoopFilterFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t delta_enabled;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t delta_update;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESALoopFilterFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESALoopFilter {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESALoopFilterFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t level[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t sharpness;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t ref_deltas[8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t mode_deltas[2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESALoopFilter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAFrameHeaderFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t error_resilient_mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t disable_cdf_update;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t use_superres;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t render_and_frame_size_different;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t allow_screen_content_tools;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t is_filter_switchable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t force_integer_mv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t frame_size_override_flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t buffer_removal_time_present_flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t allow_intrabc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t frame_refs_short_signaling;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t allow_high_precision_mv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t is_motion_mode_switchable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t use_ref_frame_mvs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t disable_frame_end_update_cdf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t allow_warped_motion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t reduced_tx_set;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t reference_select;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t skip_mode_present;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t delta_q_present;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t UsesLr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAFrameHeaderFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAFrameHeader {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAFrameHeaderFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t frame_presentation_time;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t display_frame_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t current_frame_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t frame_to_show_map_idx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t frame_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t order_hint;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t primary_ref_frame;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t frame_width_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t frame_height_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t render_width_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t render_height_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t coded_denom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t refresh_frame_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t ref_order_hint[8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t ref_frame_idx[7];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t delta_frame_id_minus1[7];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t interpolation_filter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t tx_mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESATileInfo tiling;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAQuantization quantization;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESASegmentation segmentation;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESADeltaQ delta_q;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESALoopFilter loop_filter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESACDEF cdef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESALoopRestoration lr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAGlobalMotion global_motion[8]; // One per ref frame
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAFilmGrainParameters film_grain;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAFrameHeader;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAScreenCoding {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t seq_force_screen_content_tools;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAScreenCoding;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESATimingInfoFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t equal_picture_interval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESATimingInfoFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESATimingInfo {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESATimingInfoFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t num_units_in_display_tick;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t time_scale;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t num_ticks_per_picture_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESATimingInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAColorConfigFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t mono_chrome;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t color_range;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t separate_uv_delta_q;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAColorConfigFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESAColorConfig {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAColorConfigFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t bit_depth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t subsampling_x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t subsampling_y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESAColorConfig;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESASequenceHeaderFlags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t still_picture;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t reduced_still_picture_header;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t use_128x128_superblock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_filter_intra;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_intra_edge_filter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_interintra_compound;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_masked_compound;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_warped_motion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_dual_filter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_order_hint;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_jnt_comp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_ref_frame_mvs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t frame_id_numbers_present_flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_superres;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_cdef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t enable_restoration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t film_grain_params_present;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t timing_info_present_flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t initial_display_delay_present_flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESASequenceHeaderFlags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESASequenceHeader {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESASequenceHeaderFlags flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAProfile seq_profile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t frame_width_bits_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t frame_height_bits_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t max_frame_width_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t max_frame_height_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t delta_frame_id_length_minus_2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t additional_frame_id_length_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t order_hint_bits_minus_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t seq_choose_integer_mv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t seq_force_integer_mv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESATimingInfo timing_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAColorConfig color_config;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESASequenceHeader;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESATile {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t tg_start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t tg_end;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t row;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint16_t column;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESATile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct StdVideoAV1MESATileList {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESATile *tile_list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t nb_tiles;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} StdVideoAV1MESATileList;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct VkVideoDecodeAV1PictureInfoMESA {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const void *pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAFrameHeader *frame_header;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESATileList *tile_list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t skip_mode_frame_idx[2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} VkVideoDecodeAV1PictureInfoMESA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct VkVideoDecodeAV1DpbSlotInfoMESA {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const void *pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t frameIdx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t ref_order_hint[7];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t disable_frame_end_update_cdf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} VkVideoDecodeAV1DpbSlotInfoMESA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct VkVideoDecodeAV1SessionParametersAddInfoMESA {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const void *pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESASequenceHeader *sequence_header;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} VkVideoDecodeAV1SessionParametersAddInfoMESA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct VkVideoDecodeAV1SessionParametersCreateInfoMESA {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const void *pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const VkVideoDecodeAV1SessionParametersAddInfoMESA *pParametersAddInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} VkVideoDecodeAV1SessionParametersCreateInfoMESA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct VkVideoDecodeAV1ProfileInfoMESA {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const void *pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESAProfile stdProfileIdc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} VkVideoDecodeAV1ProfileInfoMESA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef enum VkVideoDecodeAV1CapabilityFlagBitsMESA {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VK_VIDEO_DECODE_AV1_CAPABILITY_EXTERNAL_FILM_GRAIN_MESA = 0x00000001,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VK_VIDEO_DECODE_AV1_CAPABILITY_FLAG_BITS_MAX_ENUM_MESA = 0x7FFFFFFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} VkVideoDecodeAV1CapabilityFlagBitsMESA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef VkFlags VkVideoDecodeAV1CapabilityFlagsMESA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct VkVideoDecodeAV1CapabilitiesMESA {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const void *pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VkVideoDecodeAV1CapabilityFlagsMESA flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StdVideoAV1MESALevel maxLevelIdc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} VkVideoDecodeAV1CapabilitiesMESA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_MESA 1000509000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA 1000509001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_ADD_INFO_MESA 1000509002
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_MESA 1000509003
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_MESA 1000509004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA 1000509005
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/vulkan_video_codec_av1std_decode.h 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Copyright 2023 Lynne
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Copyright 2023 Dave Airlie
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Licensed under the Apache License, Version 2.0 (the "License");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * you may not use this file except in compliance with the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * You may obtain a copy of the License at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * http://www.apache.org/licenses/LICENSE-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Unless required by applicable law or agreed to in writing, software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * distributed under the License is distributed on an "AS IS" BASIS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * See the License for the specific language governing permissions and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * limitations under the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define vulkan_video_codec_av1std_decode 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavutil/hwcontext_vulkan.c.orig 2023-12-31 00:07:26 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavutil/hwcontext_vulkan.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -437,7 +437,7 @@ static const VulkanOptExtension optional_device_exts[]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_QUEUE },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H264 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H265 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { "VK_MESA_video_decode_av1", FF_VK_EXT_VIDEO_DECODE_AV1 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_AV1 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static VkBool32 VKAPI_CALL vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEXT severity,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavutil/vulkan_functions.h.orig 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavutil/vulkan_functions.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,7 @@ typedef enum FFVulkanExtensions {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_VK_EXT_VIDEO_DECODE_QUEUE = 1ULL << 11, /* VK_KHR_video_decode_queue */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_VK_EXT_VIDEO_DECODE_H264 = 1ULL << 12, /* VK_EXT_video_decode_h264 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_VK_EXT_VIDEO_DECODE_H265 = 1ULL << 13, /* VK_EXT_video_decode_h265 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_VK_EXT_VIDEO_DECODE_AV1 = 1ULL << 14, /* VK_MESA_video_decode_av1 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FF_VK_EXT_VIDEO_DECODE_AV1 = 1ULL << 14, /* VK_KHR_video_decode_av1 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_VK_EXT_ATOMIC_FLOAT = 1ULL << 15, /* VK_EXT_shader_atomic_float */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_VK_EXT_COOP_MATRIX = 1ULL << 16, /* VK_KHR_cooperative_matrix */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavutil/vulkan_loader.h.orig 2023-11-11 00:25:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavutil/vulkan_loader.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,7 +56,7 @@ static inline uint64_t ff_vk_extensions_to_mask(const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_QUEUE },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H264 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H265 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { "VK_MESA_video_decode_av1", FF_VK_EXT_VIDEO_DECODE_AV1 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_AV1 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFVulkanExtensions mask = 0x0;
</span></pre><pre style='margin:0'>
</pre>