The original either reported 8 or 16-bit conversion from the
original, rather than being able to return the actual original.
This makes it usable in a situation where preserving exactness
is required.
---
libavfilter/vf_avgblur_vulkan.c | 3 +-
libavfilter/vf_blend_vulkan.c | 3 +-
libavfilter/vf_bwdif_vulkan.c | 3 +-
libavfilter/vf_chromaber_vulkan.c | 3 +-
libavfilter/vf_flip_vulkan.c | 3 +-
libavfilter/vf_gblur_vulkan.c | 3 +-
libavfilter/vf_nlmeans_vulkan.c | 3 +-
libavfilter/vf_overlay_vulkan.c | 3 +-
libavfilter/vf_scale_vulkan.c | 3 +-
libavfilter/vf_transpose_vulkan.c | 3 +-
libavfilter/vf_xfade_vulkan.c | 3 +-
libavfilter/vsrc_testsrc_vulkan.c | 3 +-
libavutil/vulkan.c | 143 +++++++++++++++++++++++++++++-
libavutil/vulkan.h | 14 ++-
14 files changed, 176 insertions(+), 17 deletions(-)
diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c
index 36f00a7a74..df6f1062e8 100644
--- a/libavfilter/vf_avgblur_vulkan.c
+++ b/libavfilter/vf_avgblur_vulkan.c
@@ -99,7 +99,8 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame
*in)
{
.name = "output_img",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavfilter/vf_blend_vulkan.c b/libavfilter/vf_blend_vulkan.c
index a2834353e7..a696a3f104 100644
--- a/libavfilter/vf_blend_vulkan.c
+++ b/libavfilter/vf_blend_vulkan.c
@@ -170,7 +170,8 @@ static av_cold int init_filter(AVFilterContext *avctx)
{
.name = "output_images",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavfilter/vf_bwdif_vulkan.c b/libavfilter/vf_bwdif_vulkan.c
index 16a53319ad..a9be925095 100644
--- a/libavfilter/vf_bwdif_vulkan.c
+++ b/libavfilter/vf_bwdif_vulkan.c
@@ -104,7 +104,8 @@ static av_cold int init_filter(AVFilterContext *ctx)
{
.name = "dst",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavfilter/vf_chromaber_vulkan.c
b/libavfilter/vf_chromaber_vulkan.c
index e677261259..0317cace19 100644
--- a/libavfilter/vf_chromaber_vulkan.c
+++ b/libavfilter/vf_chromaber_vulkan.c
@@ -117,7 +117,8 @@ static av_cold int init_filter(AVFilterContext *ctx,
AVFrame *in)
{
.name = "output_img",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavfilter/vf_flip_vulkan.c b/libavfilter/vf_flip_vulkan.c
index 396f85da9b..e65ccaaa0e 100644
--- a/libavfilter/vf_flip_vulkan.c
+++ b/libavfilter/vf_flip_vulkan.c
@@ -83,7 +83,8 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame
*in, enum FlipType
{
.name = "output_image",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavfilter/vf_gblur_vulkan.c b/libavfilter/vf_gblur_vulkan.c
index 110f19e555..c8cc394c82 100644
--- a/libavfilter/vf_gblur_vulkan.c
+++ b/libavfilter/vf_gblur_vulkan.c
@@ -228,7 +228,8 @@ static av_cold int init_filter(AVFilterContext *ctx,
AVFrame *in)
{
.name = "output_images",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavfilter/vf_nlmeans_vulkan.c b/libavfilter/vf_nlmeans_vulkan.c
index 86f5cd9f37..7cdc3f00df 100644
--- a/libavfilter/vf_nlmeans_vulkan.c
+++ b/libavfilter/vf_nlmeans_vulkan.c
@@ -454,7 +454,8 @@ static av_cold int init_denoise_pipeline(FFVulkanContext
*vkctx, FFVkExecPool *e
{
.name = "output_img",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(vkctx->output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(vkctx->output_format,
+ vkctx->hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c
index 4c77dcc8fe..10909fe694 100644
--- a/libavfilter/vf_overlay_vulkan.c
+++ b/libavfilter/vf_overlay_vulkan.c
@@ -139,7 +139,8 @@ static av_cold int init_filter(AVFilterContext *ctx)
{
.name = "output_img",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavfilter/vf_scale_vulkan.c b/libavfilter/vf_scale_vulkan.c
index d8f2b5303d..3163dfd942 100644
--- a/libavfilter/vf_scale_vulkan.c
+++ b/libavfilter/vf_scale_vulkan.c
@@ -171,7 +171,8 @@ static av_cold int init_filter(AVFilterContext *ctx,
AVFrame *in)
{
.name = "output_img",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = av_pix_fmt_count_planes(s->vkctx.output_format),
diff --git a/libavfilter/vf_transpose_vulkan.c
b/libavfilter/vf_transpose_vulkan.c
index 48d60be6cc..efc72c53cd 100644
--- a/libavfilter/vf_transpose_vulkan.c
+++ b/libavfilter/vf_transpose_vulkan.c
@@ -82,7 +82,8 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame
*in)
{
.name = "output_images",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavfilter/vf_xfade_vulkan.c b/libavfilter/vf_xfade_vulkan.c
index 8f7b8a0913..aad7903061 100644
--- a/libavfilter/vf_xfade_vulkan.c
+++ b/libavfilter/vf_xfade_vulkan.c
@@ -364,7 +364,8 @@ static av_cold int init_vulkan(AVFilterContext *avctx)
{
.name = "output_images",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavfilter/vsrc_testsrc_vulkan.c
b/libavfilter/vsrc_testsrc_vulkan.c
index a7d573b529..37c988c66c 100644
--- a/libavfilter/vsrc_testsrc_vulkan.c
+++ b/libavfilter/vsrc_testsrc_vulkan.c
@@ -102,7 +102,8 @@ static av_cold int init_filter(AVFilterContext *ctx, enum
TestSrcVulkanMode mode
{
.name = "output_img",
.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format),
+ .mem_layout = ff_vk_shader_rep_fmt(s->vkctx.output_format,
+ s->vkctx.hwfc->format,
FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 9c5959f730..7dbd3fa573 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1286,11 +1286,146 @@ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt)
return 0;
}
-const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pixfmt)
+const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pix_fmt,
+ VkFormat format[AV_NUM_DATA_POINTERS],
+ enum FFVkShaderRepFormat rep_fmt)
{
- const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pixfmt);
- const int high = desc->comp[0].depth > 8;
- return high ? "rgba16f" : "rgba8";
+ int individual = format && (format[1] != VK_FORMAT_UNDEFINED);
+ switch (pix_fmt) {
+ case AV_PIX_FMT_YUV420P:
+ case AV_PIX_FMT_YUV422P:
+ case AV_PIX_FMT_YUV444P:
+ pix_fmt = individual ? AV_PIX_FMT_GRAY8 : AV_PIX_FMT_RGBA;
+ break;
+ case AV_PIX_FMT_YUV420P10:
+ case AV_PIX_FMT_YUV422P10:
+ case AV_PIX_FMT_YUV444P10:
+ pix_fmt = individual ? AV_PIX_FMT_GRAY16 : AV_PIX_FMT_X2RGB10;
+ break;
+ case AV_PIX_FMT_YUV420P12:
+ case AV_PIX_FMT_YUV420P16:
+ case AV_PIX_FMT_YUV422P12:
+ case AV_PIX_FMT_YUV422P16:
+ case AV_PIX_FMT_YUV444P12:
+ case AV_PIX_FMT_YUV444P16:
+ pix_fmt = individual ? AV_PIX_FMT_GRAY16 : AV_PIX_FMT_RGB48;
+ break;
+ default:
+ break;
+ };
+
+ switch (pix_fmt) {
+ case AV_PIX_FMT_RGBA:
+ case AV_PIX_FMT_BGRA:
+ case AV_PIX_FMT_RGB24:
+ case AV_PIX_FMT_BGR24:
+ case AV_PIX_FMT_BGR0:
+ case AV_PIX_FMT_RGB0:
+ case AV_PIX_FMT_RGB565:
+ case AV_PIX_FMT_BGR565:
+ case AV_PIX_FMT_YUYV422:
+ case AV_PIX_FMT_UYVY422: {
+ const char *rep_tab[] = {
+ [FF_VK_REP_NATIVE] = "rgba8ui",
+ [FF_VK_REP_FLOAT] = "rgba8",
+ [FF_VK_REP_INT] = "rgba8i",
+ [FF_VK_REP_UINT] = "rgba8ui",
+ };
+ return rep_tab[rep_fmt];
+ }
+ case AV_PIX_FMT_RGB48:
+ case AV_PIX_FMT_RGBA64:
+ case AV_PIX_FMT_Y212:
+ case AV_PIX_FMT_XV36: {
+ const char *rep_tab[] = {
+ [FF_VK_REP_NATIVE] = "rgba16ui",
+ [FF_VK_REP_FLOAT] = "rgba16",
+ [FF_VK_REP_INT] = "rgba16i",
+ [FF_VK_REP_UINT] = "rgba16ui",
+ };
+ return rep_tab[rep_fmt];
+ }
+ case AV_PIX_FMT_X2RGB10:
+ case AV_PIX_FMT_X2BGR10:
+ case AV_PIX_FMT_Y210: {
+ const char *rep_tab[] = {
+ [FF_VK_REP_NATIVE] = "rgb10_a2ui",
+ [FF_VK_REP_FLOAT] = "rgb10_a2",
+ [FF_VK_REP_INT] = NULL,
+ [FF_VK_REP_UINT] = "rgb10_a2ui",
+ };
+ return rep_tab[rep_fmt];
+ }
+ case AV_PIX_FMT_GRAY8:
+ case AV_PIX_FMT_GBRAP: {
+ const char *rep_tab[] = {
+ [FF_VK_REP_NATIVE] = "r8ui",
+ [FF_VK_REP_FLOAT] = "r8",
+ [FF_VK_REP_INT] = "r8i",
+ [FF_VK_REP_UINT] = "r8ui",
+ };
+ return rep_tab[rep_fmt];
+ };
+ case AV_PIX_FMT_GRAY16:
+ case AV_PIX_FMT_GBRAP16: {
+ const char *rep_tab[] = {
+ [FF_VK_REP_NATIVE] = "r16ui",
+ [FF_VK_REP_FLOAT] = "r16f",
+ [FF_VK_REP_INT] = "r16i",
+ [FF_VK_REP_UINT] = "r16ui",
+ };
+ return rep_tab[rep_fmt];
+ };
+ case AV_PIX_FMT_GRAYF32:
+ case AV_PIX_FMT_GBRPF32:
+ case AV_PIX_FMT_GBRAPF32: {
+ const char *rep_tab[] = {
+ [FF_VK_REP_NATIVE] = "r32f",
+ [FF_VK_REP_FLOAT] = "r32f",
+ [FF_VK_REP_INT] = "r32i",
+ [FF_VK_REP_UINT] = "r32ui",
+ };
+ return rep_tab[rep_fmt];
+ };
+ case AV_PIX_FMT_NV12:
+ case AV_PIX_FMT_NV16:
+ case AV_PIX_FMT_NV24: {
+ const char *rep_tab[] = {
+ [FF_VK_REP_NATIVE] = "rg8ui",
+ [FF_VK_REP_FLOAT] = "rg8",
+ [FF_VK_REP_INT] = "rg8i",
+ [FF_VK_REP_UINT] = "rg8ui",
+ };
+ return rep_tab[rep_fmt];
+ };
+ case AV_PIX_FMT_P010:
+ case AV_PIX_FMT_P210:
+ case AV_PIX_FMT_P410: {
+ const char *rep_tab[] = {
+ [FF_VK_REP_NATIVE] = "rgb10_a2ui",
+ [FF_VK_REP_FLOAT] = "rgb10_a2",
+ [FF_VK_REP_INT] = NULL,
+ [FF_VK_REP_UINT] = "rgb10_a2ui",
+ };
+ return rep_tab[rep_fmt];
+ };
+ case AV_PIX_FMT_P012:
+ case AV_PIX_FMT_P016:
+ case AV_PIX_FMT_P212:
+ case AV_PIX_FMT_P216:
+ case AV_PIX_FMT_P412:
+ case AV_PIX_FMT_P416: {
+ const char *rep_tab[] = {
+ [FF_VK_REP_NATIVE] = "rg16ui",
+ [FF_VK_REP_FLOAT] = "rg16",
+ [FF_VK_REP_INT] = "rg16i",
+ [FF_VK_REP_UINT] = "rg16ui",
+ };
+ return rep_tab[rep_fmt];
+ };
+ default:
+ return "rgba32f";
+ }
}
typedef struct ImageViewCtx {
diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h
index 8d60fae670..4de5835f60 100644
--- a/libavutil/vulkan.h
+++ b/libavutil/vulkan.h
@@ -360,7 +360,19 @@ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt);
/**
* Returns the format to use for images in shaders.
*/
-const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pixfmt);
+enum FFVkShaderRepFormat {
+ /* Native format with no conversion. May require casting. */
+ FF_VK_REP_NATIVE = 0,
+ /* Float conversion of the native format. */
+ FF_VK_REP_FLOAT,
+ /* Signed integer version of the native format */
+ FF_VK_REP_INT,
+ /* Unsigned integer version of the native format */
+ FF_VK_REP_UINT,
+};
+const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pix_fmt,
+ VkFormat format[AV_NUM_DATA_POINTERS],
+ enum FFVkShaderRepFormat rep_fmt);
/**
* Loads props/mprops/driver_props
--
2.45.2.753.g447d99e1c3b
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
