RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vulkan: extend ff_vk_shader_rep_fmt to be useful for bitexactness 

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.
This commit is contained in:
Lynne 2024-10-10 05:03:17 +02:00
parent bd6283342c
commit c982376076
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
14 changed files with 150 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_avgblur_vulkan.c
View File

@ -99,7 +99,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

2
libavfilter/vf_blend_vulkan.c
View File

@ -170,7 +170,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

2
libavfilter/vf_bwdif_vulkan.c
View File

@ -104,7 +104,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

2
libavfilter/vf_chromaber_vulkan.c
View File

@ -117,7 +117,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

2
libavfilter/vf_flip_vulkan.c
View File

@ -83,7 +83,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

2
libavfilter/vf_gblur_vulkan.c
View File

@ -228,7 +228,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

2
libavfilter/vf_nlmeans_vulkan.c
View File

@ -454,7 +454,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

2
libavfilter/vf_overlay_vulkan.c
View File

@ -139,7 +139,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

2
libavfilter/vf_scale_vulkan.c
View File

@ -171,7 +171,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = av_pix_fmt_count_planes(s->vkctx.output_format),

2
libavfilter/vf_transpose_vulkan.c
View File

@ -82,7 +82,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

2
libavfilter/vf_xfade_vulkan.c
View File

@ -364,7 +364,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

2
libavfilter/vsrc_testsrc_vulkan.c
View File

@ -102,7 +102,7 @@ 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, FF_VK_REP_FLOAT),
.mem_quali = "writeonly",
.dimensions = 2,
.elems = planes,

130
libavutil/vulkan.c
View File

@ -1286,11 +1286,133 @@ 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,
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";
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_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_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_GRAY8:
case AV_PIX_FMT_GBRAP:
case AV_PIX_FMT_YUV420P:
case AV_PIX_FMT_YUV422P:
case AV_PIX_FMT_YUV444P: {
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:
case AV_PIX_FMT_YUV420P10:
case AV_PIX_FMT_YUV420P12:
case AV_PIX_FMT_YUV420P16:
case AV_PIX_FMT_YUV422P10:
case AV_PIX_FMT_YUV422P12:
case AV_PIX_FMT_YUV422P16:
case AV_PIX_FMT_YUV444P10:
case AV_PIX_FMT_YUV444P12:
case AV_PIX_FMT_YUV444P16: {
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 {

13
libavutil/vulkan.h
View File

@ -360,7 +360,18 @@ 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,
enum FFVkShaderRepFormat rep_fmt);
/**
* Loads props/mprops/driver_props