September 2024 - ffmpeg-devel

[PATCH] avfilter/formats: correct error message
by Gyan Doshi 01 Sep '24

01 Sep '24

The check is for color space, not range. --- libavfilter/formats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index eabc3ec946..2b570b466e 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -977,7 +977,7 @@ int ff_formats_check_color_spaces(void *log, const AVFilterFormats *fmts) { for (int i = 0; fmts && i < fmts->nb_formats; i++) { if (fmts->formats[i] == AVCOL_SPC_RESERVED) { - av_log(log, AV_LOG_ERROR, "Invalid color range\n"); + av_log(log, AV_LOG_ERROR, "Invalid color space\n"); return AVERROR(EINVAL); } } -- 2.44.0

1 2

[PATCH 1/2] avcodec/vvcdec: filter, fix uninitialized variables for YUV400 format
by Nuo Mi 31 Aug '24

31 Aug '24

fix ==135000== Conditional jump or move depends on uninitialised value(s) ==135000== at 0x169FF95: vvc_deblock_bs (filter.c:699) and ==135000== Conditional jump or move depends on uninitialised value(s) ==135000== at 0x16A2E72: ff_vvc_alf_filter (filter.c:1217) Reported-by: James Almer <jamrial(a)gmail.com> --- libavcodec/vvc/filter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/vvc/filter.c b/libavcodec/vvc/filter.c index c96e59df89..aa0d542271 100644 --- a/libavcodec/vvc/filter.c +++ b/libavcodec/vvc/filter.c @@ -686,11 +686,12 @@ static void vvc_deblock_bs(const VVCLocalContext *lc, const int x0, const int y0 const int ctb_size = sps->ctb_size_y; const int x_end = FFMIN(x0 + ctb_size, pps->width) >> MIN_TU_LOG2; const int y_end = FFMIN(y0 + ctb_size, pps->height) >> MIN_TU_LOG2; + const int has_chroma = !!sps->r->sps_chroma_format_idc; deblock_bs_fn deblock_bs[] = { vvc_deblock_bs_luma, vvc_deblock_bs_chroma }; - for (int is_chroma = 0; is_chroma <= 1; is_chroma++) { + for (int is_chroma = 0; is_chroma <= has_chroma; is_chroma++) { const int hs = sps->hshift[is_chroma]; const int vs = sps->vshift[is_chroma]; for (int y = y0 >> MIN_TU_LOG2; y < y_end; y++) { @@ -1194,6 +1195,7 @@ void ff_vvc_alf_filter(VVCLocalContext *lc, const int x0, const int y0) const int padded_stride = EDGE_EMU_BUFFER_STRIDE << ps; const int padded_offset = padded_stride * ALF_PADDING_SIZE + (ALF_PADDING_SIZE << ps); const int c_end = sps->r->sps_chroma_format_idc ? VVC_MAX_SAMPLE_ARRAYS : 1; + const int has_chroma = !!sps->r->sps_chroma_format_idc; const int ctu_end = y0 + sps->ctb_size_y; const ALFParams *alf = &CTB(fc->tab.alf, rx, ry); int sb_edges[MAX_VBBS][MAX_EDGES], nb_sbs; @@ -1214,7 +1216,7 @@ void ff_vvc_alf_filter(VVCLocalContext *lc, const int x0, const int y0) uint8_t *src = POS(c_idx, sb->l, sb->t); uint8_t *padded; - if (alf->ctb_flag[c_idx] || (!c_idx && (alf->ctb_cc_idc[0] || alf->ctb_cc_idc[1]))) { + if (alf->ctb_flag[c_idx] || (!c_idx && has_chroma && (alf->ctb_cc_idc[0] || alf->ctb_cc_idc[1]))) { padded = (c_idx ? lc->alf_buffer_chroma : lc->alf_buffer_luma) + padded_offset; alf_prepare_buffer(fc, padded, src, x, y, rx, ry, width, height, padded_stride, src_stride, c_idx, sb_edges[i]); -- 2.34.1

1 2

[PATCH] hwcontext_vulkan: ask for storage images by default
by Lynne 31 Aug '24

31 Aug '24

The issue is that we ask for storage images by default if available, but because that is gated by the format supporting storage images, and the check for the format supporting storage images is gated by the usage, this resulted in a catch-22. --- libavutil/hwcontext_vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 383e75397e..763fb9d120 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -2628,7 +2628,8 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc) hwctx->tiling, hwctx->format, NULL, NULL, &supported_usage, disable_multiplane, - hwctx->usage & VK_IMAGE_USAGE_STORAGE_BIT); + !hwctx->usage || + (hwctx->usage & VK_IMAGE_USAGE_STORAGE_BIT)); if (err < 0) return err; } -- 2.45.2.753.g447d99e1c3b

1 0