[FFmpeg-cvslog] vulkan: fix layout qualifiers for 32-bit RGBA float storage reps

2024-10-11 Thread Lynne 
ffmpeg | branch: master | Lynne  | Sat Oct 12 00:35:04 2024 
+0200| [0e19b05375cf0a00240f0b08722bbfd14ccf9682] | committer: Lynne

vulkan: fix layout qualifiers for 32-bit RGBA float storage reps

r8
r16/r16f
r32f

Sure, GLSL. Makes sense.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e19b05375cf0a00240f0b08722bbfd14ccf9682
---

 libavutil/vulkan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index b80867676c..661b2627c9 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1335,8 +1335,8 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat 
pix_fmt,
 case AV_PIX_FMT_RGBF32:
 case AV_PIX_FMT_RGBAF32: {
 const char *rep_tab[] = {
-[FF_VK_REP_NATIVE] = "rgba32",
-[FF_VK_REP_FLOAT] = "rgba32",
+[FF_VK_REP_NATIVE] = "rgba32f",
+[FF_VK_REP_FLOAT] = "rgba32f",
 [FF_VK_REP_INT] = "rgba32i",
 [FF_VK_REP_UINT] = "rgba32ui",
 };

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/vaapi_encode: fix compilation without CONFIG_VAAPI_1

2024-10-11 Thread Ingo Brückl 
ffmpeg | branch: master | Ingo Brückl  | Wed Oct  9 04:43:01 
2024 +0200| [5557c673ea783a48e8b97c2b740b22eeeca6399b] | committer: Haihao Xiang

avcodec/vaapi_encode: fix compilation without CONFIG_VAAPI_1

This adds VAAPIEncodeContext *ctx that has been removed
in aa82340b0ccdde4955fba41b8de5e45348ecd11d.

Signed-off-by: Ingo Brückl 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5557c673ea783a48e8b97c2b740b22eeeca6399b
---

 libavcodec/vaapi_encode_h264.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index fb87b68bec..ed20b9cd24 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -406,6 +406,9 @@ static int 
vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
  FFHWBaseEncodePicture *pic)
 {
 FFHWBaseEncodeContext   *base_ctx = avctx->priv_data;
+#if !CONFIG_VAAPI_1
+VAAPIEncodeContext   *ctx = avctx->priv_data;
+#endif
 VAAPIEncodeH264Context  *priv = avctx->priv_data;
 VAAPIEncodePicture *vaapi_pic = pic->priv;
 VAAPIEncodeH264Picture  *hpic = pic->codec_priv;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/vaapi_encode: fix compilation without CONFIG_VAAPI_1

2024-10-11 Thread Ingo Brückl 
ffmpeg | branch: release/7.1 | Ingo Brückl  | Wed Oct  9 
04:43:01 2024 +0200| [5c59d97e8ab90daefa198dcfb0ee4fdf9c57e37f] | committer: 
Haihao Xiang

avcodec/vaapi_encode: fix compilation without CONFIG_VAAPI_1

This adds VAAPIEncodeContext *ctx that has been removed
in aa82340b0ccdde4955fba41b8de5e45348ecd11d.

Signed-off-by: Ingo Brückl 
(cherry picked from commit 5557c673ea783a48e8b97c2b740b22eeeca6399b)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c59d97e8ab90daefa198dcfb0ee4fdf9c57e37f
---

 libavcodec/vaapi_encode_h264.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index fb87b68bec..ed20b9cd24 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -406,6 +406,9 @@ static int 
vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
  FFHWBaseEncodePicture *pic)
 {
 FFHWBaseEncodeContext   *base_ctx = avctx->priv_data;
+#if !CONFIG_VAAPI_1
+VAAPIEncodeContext   *ctx = avctx->priv_data;
+#endif
 VAAPIEncodeH264Context  *priv = avctx->priv_data;
 VAAPIEncodePicture *vaapi_pic = pic->priv;
 VAAPIEncodeH264Picture  *hpic = pic->codec_priv;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/hevc/ps: add a range check for sps_max_sub_layers

2024-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Sat Oct  5 19:56:34 
2024 -0300| [bd6283342c85494cd8ed0283715a6da8f5a4ccf0] | committer: James Almer

avcodec/hevc/ps: add a range check for sps_max_sub_layers

It can't be higher than vps_max_sub_layers.

Do this while keeping the workaround for qsvenc_hevc calling ff_hevc_parse_sps()
without a vps_list, as in some cases it needs to parse an sps to generate a fake
vps derived from it.

Signed-off-by: James Almer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd6283342c85494cd8ed0283715a6da8f5a4ccf0
---

 libavcodec/hevc/ps.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/hevc/ps.c b/libavcodec/hevc/ps.c
index ffb2436d7f..a1d352eec5 100644
--- a/libavcodec/hevc/ps.c
+++ b/libavcodec/hevc/ps.c
@@ -1158,6 +1158,7 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, 
unsigned int *sps_id,
 HEVCWindow *ow;
 int ret = 0;
 int bit_depth_chroma, num_comps, multi_layer_ext;
+int vps_max_sub_layers;
 int i;
 
 // Coded parameters
@@ -1182,7 +1183,10 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, 
unsigned int *sps_id,
 
 sps->max_sub_layers = sps->vps->vps_max_sub_layers;
 }
-if (sps->max_sub_layers > HEVC_MAX_SUB_LAYERS) {
+vps_max_sub_layers = sps->vps ? sps->vps->vps_max_sub_layers
+  : FFMIN(sps->max_sub_layers, 
HEVC_MAX_SUB_LAYERS);
+
+if (sps->max_sub_layers > vps_max_sub_layers) {
 av_log(avctx, AV_LOG_ERROR, "sps_max_sub_layers out of range: %d\n",
sps->max_sub_layers);
 return AVERROR_INVALIDDATA;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] vulkan: extend ff_vk_shader_rep_fmt to be useful for bitexactness

2024-10-11 Thread Lynne 
ffmpeg | branch: master | Lynne  | Thu Oct 10 05:03:17 2024 
+0200| [c982376076b6c433077c631e54b731778f90c5c8] | committer: Lynne

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c982376076b6c433077c631e54b731778f90c5c8
---

 libavfilter/vf_avgblur_vulkan.c   |   2 +-
 libavfilter/vf_blend_vulkan.c |   2 +-
 libavfilter/vf_bwdif_vulkan.c |   2 +-
 libavfilter/vf_chromaber_vulkan.c |   2 +-
 libavfilter/vf_flip_vulkan.c  |   2 +-
 libavfilter/vf_gblur_vulkan.c |   2 +-
 libavfilter/vf_nlmeans_vulkan.c   |   2 +-
 libavfilter/vf_overlay_vulkan.c   |   2 +-
 libavfilter/vf_scale_vulkan.c |   2 +-
 libavfilter/vf_transpose_vulkan.c |   2 +-
 libavfilter/vf_xfade_vulkan.c |   2 +-
 libavfilter/vsrc_testsrc_vulkan.c |   2 +-
 libavutil/vulkan.c| 130 --
 libavutil/vulkan.h|  13 +++-
 14 files changed, 150 insertions(+), 17 deletions(-)

diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c
index 36f00a7a74..b070ec1dcc 100644
--- a/libavfilter/vf_avgblur_vulkan.c
+++ b/libavfilter/vf_avgblur_vulkan.c
@@ -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,
diff --git a/libavfilter/vf_blend_vulkan.c b/libavfilter/vf_blend_vulkan.c
index a2834353e7..9505ae41f3 100644
--- a/libavfilter/vf_blend_vulkan.c
+++ b/libavfilter/vf_blend_vulkan.c
@@ -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,
diff --git a/libavfilter/vf_bwdif_vulkan.c b/libavfilter/vf_bwdif_vulkan.c
index 16a53319ad..b641d11d0b 100644
--- a/libavfilter/vf_bwdif_vulkan.c
+++ b/libavfilter/vf_bwdif_vulkan.c
@@ -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,
diff --git a/libavfilter/vf_chromaber_vulkan.c 
b/libavfilter/vf_chromaber_vulkan.c
index e677261259..576c3f5757 100644
--- a/libavfilter/vf_chromaber_vulkan.c
+++ b/libavfilter/vf_chromaber_vulkan.c
@@ -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,
diff --git a/libavfilter/vf_flip_vulkan.c b/libavfilter/vf_flip_vulkan.c
index 396f85da9b..f07a2b0128 100644
--- a/libavfilter/vf_flip_vulkan.c
+++ b/libavfilter/vf_flip_vulkan.c
@@ -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,
diff --git a/libavfilter/vf_gblur_vulkan.c b/libavfilter/vf_gblur_vulkan.c
index 110f19e555..0a36121fed 100644
--- a/libavfilter/vf_gblur_vulkan.c
+++ b/libavfilter/vf_gblur_vulkan.c
@@ -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.outp

[FFmpeg-cvslog] hwcontext_vulkan: add support for AV_PIX_FMT_RGBAF32

2024-10-11 Thread Lynne 
ffmpeg | branch: master | Lynne  | Thu Oct 10 06:43:41 2024 
+0200| [d55a3517419b11fb143da7db68308edfe3355930] | committer: Lynne

hwcontext_vulkan: add support for AV_PIX_FMT_RGBAF32

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d55a3517419b11fb143da7db68308edfe3355930
---

 libavutil/hwcontext_vulkan.c |  1 +
 libavutil/vulkan.c   | 12 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index aaf2c78ebd..1fb0481fa7 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -320,6 +320,7 @@ static const struct FFVkFormatEntry {
 { VK_FORMAT_R8G8B8A8_UNORM,   AV_PIX_FMT_RGB0,
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R8G8B8A8_UNORM   } },
 { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_X2RGB10, 
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_A2R10G10B10_UNORM_PACK32 } },
 { VK_FORMAT_A2B10G10R10_UNORM_PACK32, AV_PIX_FMT_X2BGR10, 
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_A2B10G10R10_UNORM_PACK32 } },
+{ VK_FORMAT_R32G32B32A32_SFLOAT,  AV_PIX_FMT_RGBAF32, 
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R32G32B32A32_SFLOAT  } },
 
 /* Planar RGB */
 { VK_FORMAT_R8_UNORM,   AV_PIX_FMT_GBRAP,VK_IMAGE_ASPECT_COLOR_BIT, 1, 
4, 4, { VK_FORMAT_R8_UNORM,   VK_FORMAT_R8_UNORM,   VK_FORMAT_R8_UNORM,   
VK_FORMAT_R8_UNORM   } },
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 724d633bf9..63eef4d856 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1281,7 +1281,8 @@ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt)
 pix_fmt == AV_PIX_FMT_RGBA64 || pix_fmt == AV_PIX_FMT_RGB565 ||
 pix_fmt == AV_PIX_FMT_BGR565 || pix_fmt == AV_PIX_FMT_BGR0   ||
 pix_fmt == AV_PIX_FMT_0BGR   || pix_fmt == AV_PIX_FMT_RGB0   ||
-pix_fmt == AV_PIX_FMT_X2RGB10 || pix_fmt == AV_PIX_FMT_X2BGR10)
+pix_fmt == AV_PIX_FMT_X2RGB10 || pix_fmt == AV_PIX_FMT_X2BGR10 ||
+pix_fmt == AV_PIX_FMT_RGBAF32)
 return 1;
 return 0;
 }
@@ -1331,6 +1332,15 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat 
pix_fmt,
 };
 return rep_tab[rep_fmt];
 }
+case AV_PIX_FMT_RGBAF32: {
+const char *rep_tab[] = {
+[FF_VK_REP_NATIVE] = "rgba32",
+[FF_VK_REP_FLOAT] = "rgba32",
+[FF_VK_REP_INT] = "rgba32i",
+[FF_VK_REP_UINT] = "rgba32ui",
+};
+return rep_tab[rep_fmt];
+}
 case AV_PIX_FMT_GRAY8:
 case AV_PIX_FMT_GBRAP:
 case AV_PIX_FMT_YUV420P:

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] hwcontext_vulkan: add support for AV_PIX_FMT_RGBF32

2024-10-11 Thread Lynne 
ffmpeg | branch: master | Lynne  | Thu Oct 10 07:21:26 2024 
+0200| [168e8ae9bf02e69b8e7e63d3e193bf40d5e288ab] | committer: Lynne

hwcontext_vulkan: add support for AV_PIX_FMT_RGBF32

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=168e8ae9bf02e69b8e7e63d3e193bf40d5e288ab
---

 libavutil/hwcontext_vulkan.c | 1 +
 libavutil/vulkan.c   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 1fb0481fa7..49e9c25a98 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -320,6 +320,7 @@ static const struct FFVkFormatEntry {
 { VK_FORMAT_R8G8B8A8_UNORM,   AV_PIX_FMT_RGB0,
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R8G8B8A8_UNORM   } },
 { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_X2RGB10, 
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_A2R10G10B10_UNORM_PACK32 } },
 { VK_FORMAT_A2B10G10R10_UNORM_PACK32, AV_PIX_FMT_X2BGR10, 
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_A2B10G10R10_UNORM_PACK32 } },
+{ VK_FORMAT_R32G32B32_SFLOAT, AV_PIX_FMT_RGBF32,  
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R32G32B32_SFLOAT } },
 { VK_FORMAT_R32G32B32A32_SFLOAT,  AV_PIX_FMT_RGBAF32, 
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R32G32B32A32_SFLOAT  } },
 
 /* Planar RGB */
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 63eef4d856..b80867676c 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1282,7 +1282,7 @@ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt)
 pix_fmt == AV_PIX_FMT_BGR565 || pix_fmt == AV_PIX_FMT_BGR0   ||
 pix_fmt == AV_PIX_FMT_0BGR   || pix_fmt == AV_PIX_FMT_RGB0   ||
 pix_fmt == AV_PIX_FMT_X2RGB10 || pix_fmt == AV_PIX_FMT_X2BGR10 ||
-pix_fmt == AV_PIX_FMT_RGBAF32)
+pix_fmt == AV_PIX_FMT_RGBAF32 || pix_fmt == AV_PIX_FMT_RGBF32)
 return 1;
 return 0;
 }
@@ -1332,6 +1332,7 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat 
pix_fmt,
 };
 return rep_tab[rep_fmt];
 }
+case AV_PIX_FMT_RGBF32:
 case AV_PIX_FMT_RGBAF32: {
 const char *rep_tab[] = {
 [FF_VK_REP_NATIVE] = "rgba32",

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] hwcontext_vulkan: enable shaderBufferInt64Atomics if supported

2024-10-11 Thread Lynne 
ffmpeg | branch: master | Lynne  | Thu Oct 10 07:25:39 2024 
+0200| [8c47cf9eeacaad8e6148760e43620cd79a5cc34f] | committer: Lynne

hwcontext_vulkan: enable shaderBufferInt64Atomics if supported

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c47cf9eeacaad8e6148760e43620cd79a5cc34f
---

 libavutil/hwcontext_vulkan.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 49e9c25a98..47e21fda83 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -256,6 +256,7 @@ static void 
device_features_copy_needed(VulkanDeviceFeatures *dst, VulkanDeviceF
 COPY_VAL(vulkan_1_2.storageBuffer8BitAccess);
 COPY_VAL(vulkan_1_2.uniformAndStorageBuffer8BitAccess);
 COPY_VAL(vulkan_1_2.shaderFloat16);
+COPY_VAL(vulkan_1_2.shaderBufferInt64Atomics);
 COPY_VAL(vulkan_1_2.shaderSharedInt64Atomics);
 COPY_VAL(vulkan_1_2.vulkanMemoryModel);
 COPY_VAL(vulkan_1_2.vulkanMemoryModelDeviceScope);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] vulkan: use correct signed image type for storage images

2024-10-11 Thread Lynne 
ffmpeg | branch: master | Lynne  | Thu Oct 10 05:24:32 2024 
+0200| [1addd0fdca14b354d85dc6f002813c015c5ef3cb] | committer: Lynne

vulkan: use correct signed image type for storage images

Using signed or unsigned integer formats/layouts requires that
"uimage" or "iimage" are used.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1addd0fdca14b354d85dc6f002813c015c5ef3cb
---

 libavutil/vulkan.c | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index ba79387c6f..724d633bf9 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -2005,8 +2005,21 @@ print:
 if (prop->mem_quali && desc[i].mem_quali)
 GLSLA(" %s", desc[i].mem_quali);
 
-if (prop->type)
-GLSLA(" %s", prop->type);
+if (prop->type) {
+GLSLA(" ");
+if (desc[i].type == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE) {
+if (desc[i].mem_layout) {
+int len = strlen(desc[i].mem_layout);
+if (desc[i].mem_layout[len - 1] == 'i' &&
+desc[i].mem_layout[len - 2] == 'u') {
+GLSLA("u");
+} else if (desc[i].mem_layout[len - 1] == 'i') {
+GLSLA("i");
+}
+}
+}
+GLSLA("%s", prop->type);
+}
 
 if (prop->dim_needed)
 GLSLA("%iD", desc[i].dimensions);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] libavcodec: x86: Remove an explicit include of config.asm

2024-10-11 Thread Martin Storsjö 
ffmpeg | branch: release/7.1 | Martin Storsjö  | Tue Oct  1 
23:59:41 2024 +0300| [0b5559378b1e9c309ef876ae309a61b23398355b] | committer: 
Martin Storsjö

libavcodec: x86: Remove an explicit include of config.asm

This file is never included explicitly anywhere else, it's only
included implicitly by passing -Pconfig.asm on the command line.

Signed-off-by: Martin Storsjö 
(cherry picked from commit 5c4ede6b4ff6fa8818f0ca3f686aa54c1c2092b8)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b5559378b1e9c309ef876ae309a61b23398355b
---

 libavcodec/x86/celt_pvq_search.asm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/x86/celt_pvq_search.asm 
b/libavcodec/x86/celt_pvq_search.asm
index e9bff02650..3c6974d370 100644
--- a/libavcodec/x86/celt_pvq_search.asm
+++ b/libavcodec/x86/celt_pvq_search.asm
@@ -20,7 +20,6 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;**
 
-%include "config.asm"
 %include "libavutil/x86/x86util.asm"
 
 %ifdef __NASM_VER__

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/hevc/ps: return a proper error code when we don't support parsing an sps

2024-10-11 Thread James Almer 
ffmpeg | branch: master | James Almer  | Mon Oct  7 09:36:49 
2024 -0300| [3290692d185e2da8e40f219176b3f7f13bcb3da0] | committer: James Almer

avcodec/hevc/ps: return a proper error code when we don't support parsing an sps

Signed-off-by: James Almer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3290692d185e2da8e40f219176b3f7f13bcb3da0
---

 libavcodec/hevc/ps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/hevc/ps.c b/libavcodec/hevc/ps.c
index 993c60144f..ffb2436d7f 100644
--- a/libavcodec/hevc/ps.c
+++ b/libavcodec/hevc/ps.c
@@ -1210,7 +1210,7 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, 
unsigned int *sps_id,
 if (sps->vps->nb_layers == 1) {
 av_log(avctx, AV_LOG_WARNING, "SPS %d references an unsupported 
VPS extension. Ignoring\n",
*sps_id);
-return AVERROR_INVALIDDATA;
+return AVERROR(ENOSYS);
 }
 
 if (get_bits1(gb) &&// update_rep_format_flag

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".