The branch, master has been updated
via 70be2e2ae280e1d258ee33640932eb2334451d20 (commit)
via 51843adfe5fa78f0b80f11da5cefc84bb17d5cb9 (commit)
via 3cd678506cc5ad6703cda3b9374f24442d3d2a63 (commit)
via 964e9cc63b63cee08511720ead585a7092c5c554 (commit)
from 91512f08567eefd31e80e8bc70ca6d014a5fbaa5 (commit)
- Log -----------------------------------------------------------------
commit 70be2e2ae280e1d258ee33640932eb2334451d20
Author: Lynne <[email protected]>
AuthorDate: Sun Oct 26 22:46:35 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Tue Oct 28 07:11:26 2025 +0100
lavc/hwaccels: properly order list
diff --git a/libavcodec/hwaccels.h b/libavcodec/hwaccels.h
index 0894d84a9c..638a7bfb1d 100644
--- a/libavcodec/hwaccels.h
+++ b/libavcodec/hwaccels.h
@@ -67,8 +67,8 @@ extern const struct FFHWAccel ff_mpeg4_vaapi_hwaccel;
extern const struct FFHWAccel ff_mpeg4_vdpau_hwaccel;
extern const struct FFHWAccel ff_mpeg4_videotoolbox_hwaccel;
extern const struct FFHWAccel ff_prores_videotoolbox_hwaccel;
-extern const struct FFHWAccel ff_prores_raw_vulkan_hwaccel;
extern const struct FFHWAccel ff_prores_vulkan_hwaccel;
+extern const struct FFHWAccel ff_prores_raw_vulkan_hwaccel;
extern const struct FFHWAccel ff_vc1_d3d11va_hwaccel;
extern const struct FFHWAccel ff_vc1_d3d11va2_hwaccel;
extern const struct FFHWAccel ff_vc1_d3d12va_hwaccel;
commit 51843adfe5fa78f0b80f11da5cefc84bb17d5cb9
Author: Lynne <[email protected]>
AuthorDate: Fri Oct 17 14:12:11 2025 +0200
Commit: Lynne <[email protected]>
CommitDate: Tue Oct 28 07:11:26 2025 +0100
vulkan/rangecoder: ifdef out encode and decode chunks
There's little code sharing between them.
diff --git a/libavcodec/vulkan/rangecoder.comp
b/libavcodec/vulkan/rangecoder.comp
index b6b6c0490f..98ff743b2e 100644
--- a/libavcodec/vulkan/rangecoder.comp
+++ b/libavcodec/vulkan/rangecoder.comp
@@ -31,6 +31,19 @@ struct RangeCoder {
uint8_t outstanding_byte;
};
+void rac_init(out RangeCoder r, u8buf data, uint buf_size)
+{
+ r.bytestream_start = uint64_t(data);
+ r.bytestream = uint64_t(data);
+ r.bytestream_end = uint64_t(data) + buf_size;
+ r.low = 0;
+ r.range = 0xFF00;
+ r.outstanding_count = uint16_t(0);
+ r.outstanding_byte = uint8_t(0xFF);
+}
+
+#if !defined(DECODE)
+
#ifdef FULL_RENORM
/* Full renorm version that can handle outstanding_byte == 0xFF */
void renorm_encoder(inout RangeCoder c)
@@ -165,16 +178,7 @@ uint32_t rac_terminate(inout RangeCoder c)
return uint32_t(uint64_t(c.bytestream) - uint64_t(c.bytestream_start));
}
-void rac_init(out RangeCoder r, u8buf data, uint buf_size)
-{
- r.bytestream_start = uint64_t(data);
- r.bytestream = uint64_t(data);
- r.bytestream_end = uint64_t(data) + buf_size;
- r.low = 0;
- r.range = 0xFF00;
- r.outstanding_count = uint16_t(0);
- r.outstanding_byte = uint8_t(0xFF);
-}
+#else
/* Decoder */
uint overread = 0;
@@ -239,3 +243,5 @@ bool get_rac_equi(inout RangeCoder c)
{
return get_rac_internal(c, c.range >> 1);
}
+
+#endif
commit 3cd678506cc5ad6703cda3b9374f24442d3d2a63
Author: Lynne <[email protected]>
AuthorDate: Thu Oct 16 03:11:32 2025 +0200
Commit: Lynne <[email protected]>
CommitDate: Tue Oct 28 07:11:26 2025 +0100
vulkan_decode: align images to the subsampling
Normally, the Vulkan drivers handle this. But Vulkan decided "nah".
This requires API users to crop out odd-numbered images with subsampling.
diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c
index 11b4b32d5d..8930005ed1 100644
--- a/libavcodec/vulkan_decode.c
+++ b/libavcodec/vulkan_decode.c
@@ -1140,8 +1140,9 @@ int ff_vk_frame_params(AVCodecContext *avctx, AVBufferRef
*hw_frames_ctx)
}
}
- frames_ctx->width = avctx->coded_width;
- frames_ctx->height = avctx->coded_height;
+ const AVPixFmtDescriptor *pdesc =
av_pix_fmt_desc_get(frames_ctx->sw_format);
+ frames_ctx->width = FFALIGN(avctx->coded_width, 1 <<
pdesc->log2_chroma_w);
+ frames_ctx->height = FFALIGN(avctx->coded_height, 1 <<
pdesc->log2_chroma_h);
frames_ctx->format = AV_PIX_FMT_VULKAN;
hwfc->format[0] = vkfmt;
@@ -1348,8 +1349,8 @@ int ff_vk_decode_init(AVCodecContext *avctx)
dpb_frames = (AVHWFramesContext *)ctx->common.dpb_hwfc_ref->data;
dpb_frames->format = s->frames->format;
dpb_frames->sw_format = s->frames->sw_format;
- dpb_frames->width = avctx->coded_width;
- dpb_frames->height = avctx->coded_height;
+ dpb_frames->width = s->frames->width;
+ dpb_frames->height = s->frames->height;
dpb_hwfc = dpb_frames->hwctx;
dpb_hwfc->create_pnext = (void
*)ff_vk_find_struct(ctx->s.hwfc->create_pnext,
commit 964e9cc63b63cee08511720ead585a7092c5c554
Author: Lynne <[email protected]>
AuthorDate: Sat Oct 18 05:57:05 2025 +0200
Commit: Lynne <[email protected]>
CommitDate: Tue Oct 28 07:11:21 2025 +0100
hwcontext_vulkan: add support for VK_EXT_zero_initialize_device_memory
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index a8f0177519..f7b487913b 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -82,6 +82,10 @@ typedef struct VulkanDeviceFeatures {
VkPhysicalDeviceShaderSubgroupRotateFeaturesKHR subgroup_rotate;
VkPhysicalDeviceHostImageCopyFeaturesEXT host_image_copy;
+#ifdef VK_EXT_zero_initialize_device_memory
+ VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT zero_initialize;
+#endif
+
#ifdef VK_KHR_shader_expect_assume
VkPhysicalDeviceShaderExpectAssumeFeaturesKHR expect_assume;
#endif
@@ -225,6 +229,11 @@ static void device_features_init(AVHWDeviceContext *ctx,
VulkanDeviceFeatures *f
FF_VK_STRUCT_EXT(s, &feats->device, &feats->host_image_copy,
FF_VK_EXT_HOST_IMAGE_COPY,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_IMAGE_COPY_FEATURES_EXT);
+#ifdef VK_EXT_zero_initialize_device_memory
+ FF_VK_STRUCT_EXT(s, &feats->device, &feats->zero_initialize,
FF_VK_EXT_ZERO_INITIALIZE,
+
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_DEVICE_MEMORY_FEATURES_EXT);
+#endif
+
#ifdef VK_KHR_shader_expect_assume
FF_VK_STRUCT_EXT(s, &feats->device, &feats->expect_assume,
FF_VK_EXT_EXPECT_ASSUME,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR);
@@ -311,6 +320,10 @@ static void
device_features_copy_needed(VulkanDeviceFeatures *dst, VulkanDeviceF
COPY_VAL(subgroup_rotate.shaderSubgroupRotate);
COPY_VAL(host_image_copy.hostImageCopy);
+#ifdef VK_EXT_zero_initialize_device_memory
+ COPY_VAL(zero_initialize.zeroInitializeDeviceMemory);
+#endif
+
COPY_VAL(video_maintenance_1.videoMaintenance1);
#ifdef VK_KHR_video_maintenance2
COPY_VAL(video_maintenance_2.videoMaintenance2);
@@ -635,6 +648,9 @@ static const VulkanOptExtension optional_device_exts[] = {
{ VK_KHR_COOPERATIVE_MATRIX_EXTENSION_NAME,
FF_VK_EXT_COOP_MATRIX },
{ VK_EXT_SHADER_OBJECT_EXTENSION_NAME,
FF_VK_EXT_SHADER_OBJECT },
{ VK_KHR_SHADER_SUBGROUP_ROTATE_EXTENSION_NAME,
FF_VK_EXT_SUBGROUP_ROTATE },
+#ifdef VK_EXT_zero_initialize_device_memory
+ { VK_EXT_ZERO_INITIALIZE_DEVICE_MEMORY_EXTENSION_NAME,
FF_VK_EXT_ZERO_INITIALIZE },
+#endif
#ifdef VK_KHR_shader_expect_assume
{ VK_KHR_SHADER_EXPECT_ASSUME_EXTENSION_NAME,
FF_VK_EXT_EXPECT_ASSUME },
#endif
diff --git a/libavutil/vulkan_functions.h b/libavutil/vulkan_functions.h
index 4d20b7d806..d6a88160f8 100644
--- a/libavutil/vulkan_functions.h
+++ b/libavutil/vulkan_functions.h
@@ -50,6 +50,7 @@ typedef uint64_t FFVulkanExtensions;
#define FF_VK_EXT_EXPECT_ASSUME (1ULL << 16) /*
VK_KHR_shader_expect_assume */
#define FF_VK_EXT_SUBGROUP_ROTATE (1ULL << 17) /*
VK_KHR_shader_subgroup_rotate */
#define FF_VK_EXT_HOST_IMAGE_COPY (1ULL << 18) /*
VK_EXT_host_image_copy */
+#define FF_VK_EXT_ZERO_INITIALIZE (1ULL << 19) /*
VK_EXT_zero_initialize_device_memory */
/* Video extensions */
#define FF_VK_EXT_VIDEO_QUEUE (1ULL << 36) /* VK_KHR_video_queue */
diff --git a/libavutil/vulkan_loader.h b/libavutil/vulkan_loader.h
index 3207511663..dc558f9d64 100644
--- a/libavutil/vulkan_loader.h
+++ b/libavutil/vulkan_loader.h
@@ -60,6 +60,9 @@ static inline uint64_t ff_vk_extensions_to_mask(const char *
const *extensions,
{ VK_EXT_SHADER_OBJECT_EXTENSION_NAME,
FF_VK_EXT_SHADER_OBJECT },
{ VK_KHR_SHADER_SUBGROUP_ROTATE_EXTENSION_NAME,
FF_VK_EXT_SUBGROUP_ROTATE },
{ VK_EXT_HOST_IMAGE_COPY_EXTENSION_NAME,
FF_VK_EXT_HOST_IMAGE_COPY },
+#ifdef VK_EXT_zero_initialize_device_memory
+ { VK_EXT_ZERO_INITIALIZE_DEVICE_MEMORY_EXTENSION_NAME,
FF_VK_EXT_ZERO_INITIALIZE },
+#endif
{ VK_KHR_VIDEO_MAINTENANCE_1_EXTENSION_NAME,
FF_VK_EXT_VIDEO_MAINTENANCE_1 },
#ifdef VK_KHR_video_maintenance2
{ VK_KHR_VIDEO_MAINTENANCE_2_EXTENSION_NAME,
FF_VK_EXT_VIDEO_MAINTENANCE_2 },
-----------------------------------------------------------------------
Summary of changes:
libavcodec/hwaccels.h | 2 +-
libavcodec/vulkan/rangecoder.comp | 26 ++++++++++++++++----------
libavcodec/vulkan_decode.c | 9 +++++----
libavutil/hwcontext_vulkan.c | 16 ++++++++++++++++
libavutil/vulkan_functions.h | 1 +
libavutil/vulkan_loader.h | 3 +++
6 files changed, 42 insertions(+), 15 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
