August 2025 - ffmpeg-cvslog - lists.ffmpeg.org

[ffmpeg] branch release/8.0 updated. 15cb74fc68 vulkan_vp9: Read segment and lf data from cbs
by ffmpeg-git＠ffmpeg.org 21 Aug '25

21 Aug '25

The branch, release/8.0 has been updated via 15cb74fc681e159bfab3c5cf320775761aa38e3c (commit) via 9ddd245b09e8e51037ae78b2782e193b024eaccb (commit) via c1a7f4040af7a70d4edcdfd9a0f23d5bf033e234 (commit) via 17f4cc0992c3cea5129503d722bd1d9ed8d3cffd (commit) via eeff85f15d558e48ce7b2fa462db28627dd46afe (commit) from bc88c1d62e4b8f585a01e38044c9671836ae4ab5 (commit) - Log ----------------------------------------------------------------- commit 15cb74fc681e159bfab3c5cf320775761aa38e3c Author: Benjamin Cheng <ben(a)bcheng.me> AuthorDate: Tue Aug 19 10:07:01 2025 -0400 Commit: Lynne <dev(a)lynne.ee> CommitDate: Fri Aug 22 04:42:30 2025 +0900 vulkan_vp9: Read segment and lf data from cbs The previous change 26a2a76346 broke Vulkan decoding because the lf and segmentation values contained within VP9RawFrameHeader can no longer be updated. Read the propogated values from the CBS instead. (cherry picked from commit 7bfaa6d662f1f5eb000b0fae8288b07440464bff) diff --git a/libavcodec/vulkan_vp9.c b/libavcodec/vulkan_vp9.c index f8ce73dc90..7b852a29a5 100644 --- a/libavcodec/vulkan_vp9.c +++ b/libavcodec/vulkan_vp9.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "vp9shared.h" +#include "vp9dec.h" #include "vulkan_decode.h" @@ -109,7 +109,9 @@ static int vk_vp9_start_frame(AVCodecContext *avctx, { int err; int ref_count = 0; - const VP9SharedContext *s = avctx->priv_data; + const VP9Context *priv = avctx->priv_data; + const CodedBitstreamVP9Context *vp9 = priv->cbc->priv_data; + const VP9SharedContext *s = &priv->s; uint32_t frame_id_alloc_mask = 0; const VP9Frame *pic = &s->frames[CUR_FRAME]; @@ -182,15 +184,14 @@ static int vk_vp9_start_frame(AVCodecContext *avctx, .update_mode_delta = 0x0, }; - for (int i = 0; i < 2; i++) - ap->loop_filter.update_mode_delta |= pic->frame_header->update_mode_delta[i]; - for (int i = 0; i < STD_VIDEO_VP9_MAX_REF_FRAMES; i++) { - ap->loop_filter.loop_filter_ref_deltas[i] = pic->frame_header->loop_filter_ref_deltas[i]; + ap->loop_filter.loop_filter_ref_deltas[i] = vp9->loop_filter_ref_deltas[i]; ap->loop_filter.update_ref_delta |= pic->frame_header->update_ref_delta[i]; } - for (int i = 0; i < STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS; i++) - ap->loop_filter.loop_filter_mode_deltas[i] = pic->frame_header->loop_filter_mode_deltas[i]; + for (int i = 0; i < STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS; i++) { + ap->loop_filter.loop_filter_mode_deltas[i] = vp9->loop_filter_mode_deltas[i]; + ap->loop_filter.update_mode_delta |= pic->frame_header->update_mode_delta[i]; + } ap->segmentation = (StdVideoVP9Segmentation) { .flags = (StdVideoVP9SegmentationFlags) { @@ -202,16 +203,16 @@ static int vk_vp9_start_frame(AVCodecContext *avctx, }; for (int i = 0; i < STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS; i++) - ap->segmentation.segmentation_tree_probs[i] = pic->frame_header->segmentation_tree_probs[i]; + ap->segmentation.segmentation_tree_probs[i] = vp9->segmentation_tree_probs[i]; for (int i = 0; i < STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB; i++) - ap->segmentation.segmentation_pred_prob[i] = pic->frame_header->segmentation_pred_prob[i]; + ap->segmentation.segmentation_pred_prob[i] = vp9->segmentation_pred_prob[i]; for (int i = 0; i < STD_VIDEO_VP9_MAX_SEGMENTS; i++) { ap->segmentation.FeatureEnabled[i] = 0x0; for (int j = 0; j < STD_VIDEO_VP9_SEG_LVL_MAX; j++) { - ap->segmentation.FeatureEnabled[i] |= pic->frame_header->feature_enabled[i][j] << j; - ap->segmentation.FeatureData[i][j] = pic->frame_header->feature_sign[i][j] ? - -pic->frame_header->feature_value[i][j] : - +pic->frame_header->feature_value[i][j]; + ap->segmentation.FeatureEnabled[i] |= vp9->feature_enabled[i][j] << j; + ap->segmentation.FeatureData[i][j] = vp9->feature_sign[i][j] ? + -vp9->feature_value[i][j] : + +vp9->feature_value[i][j]; } } commit 9ddd245b09e8e51037ae78b2782e193b024eaccb Author: vytskalt <vytskalt(a)protonmail.com> AuthorDate: Tue Aug 19 17:14:15 2025 +0300 Commit: Lynne <dev(a)lynne.ee> CommitDate: Fri Aug 22 04:42:30 2025 +0900 hwcontext_vulkan: transfer EXCLUSIVE images to correct queue families (cherry picked from commit a6b5a382dd7ecdd27c5d0ebba688e1db409d18fd) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 77efa58db9..857dae2883 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -2466,7 +2466,7 @@ static int prepare_frame(AVHWFramesContext *hwfc, FFVkExecPool *ectx, VkImageMemoryBarrier2 img_bar[AV_NUM_DATA_POINTERS]; int nb_img_bar = 0; - uint32_t dst_qf = VK_QUEUE_FAMILY_IGNORED; + uint32_t dst_qf = p->nb_img_qfs > 1 ? VK_QUEUE_FAMILY_IGNORED : p->img_qfs[0]; VkImageLayout new_layout; VkAccessFlags2 new_access; VkPipelineStageFlagBits2 src_stage = VK_PIPELINE_STAGE_2_NONE; @@ -4548,7 +4548,7 @@ static int vulkan_transfer_frame(AVHWFramesContext *hwfc, VK_ACCESS_TRANSFER_READ_BIT, upload ? VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL : VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - VK_QUEUE_FAMILY_IGNORED); + p->nb_img_qfs > 1 ? VK_QUEUE_FAMILY_IGNORED : p->img_qfs[0]); vk->CmdPipelineBarrier2(cmd_buf, &(VkDependencyInfo) { .sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO, commit c1a7f4040af7a70d4edcdfd9a0f23d5bf033e234 Author: Lynne <dev(a)lynne.ee> AuthorDate: Wed Aug 20 22:05:38 2025 +0900 Commit: Lynne <dev(a)lynne.ee> CommitDate: Fri Aug 22 04:42:30 2025 +0900 lavfi/bwdif_vulkan: fix typo in temp_diff assignment Thanks to Niklas Haas for pointing this out. (cherry picked from commit 451e6bed436ada70a761a90f1d08f1fa505020fd) diff --git a/libavfilter/vulkan/bwdif.comp b/libavfilter/vulkan/bwdif.comp index 5c988f472e..5152464823 100644 --- a/libavfilter/vulkan/bwdif.comp +++ b/libavfilter/vulkan/bwdif.comp @@ -47,7 +47,7 @@ vec4 process_line(vec4 prev2[5], vec4 prev1[2], vec4 cur[4], vec4 next1[2], vec4 vec4 temp_diff[3]; temp_diff[0] = abs(prev2[2] - next2[2]); temp_diff[1] = (abs(prev1[0] - fc) + abs(prev1[1] - fe)) / 2; - temp_diff[1] = (abs(next1[0] - fc) + abs(next1[1] - fe)) / 2; + temp_diff[2] = (abs(next1[0] - fc) + abs(next1[1] - fe)) / 2; vec4 diff = max(temp_diff[0] / 2, max(temp_diff[1], temp_diff[2])); bvec4 diff_mask = equal(diff, vec4(0)); commit 17f4cc0992c3cea5129503d722bd1d9ed8d3cffd Author: Kacper Michajłow <kasper93(a)gmail.com> AuthorDate: Sat Aug 9 00:43:50 2025 +0200 Commit: Lynne <dev(a)lynne.ee> CommitDate: Fri Aug 22 04:42:30 2025 +0900 avcodec/vulkan_encode_av1: use CODEC_PIXFMTS to define pix_fmts Fixes deprecation warnings. Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> (cherry picked from commit b7a3c426ea118de9c3b6314408d4d37a562239a6) diff --git a/libavcodec/vulkan_encode_av1.c b/libavcodec/vulkan_encode_av1.c index d8a1097158..840092cf6d 100644 --- a/libavcodec/vulkan_encode_av1.c +++ b/libavcodec/vulkan_encode_av1.c @@ -1394,10 +1394,7 @@ const FFCodec ff_av1_vulkan_encoder = { AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .defaults = vulkan_encode_av1_defaults, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_VULKAN, - AV_PIX_FMT_NONE, - }, + CODEC_PIXFMTS(AV_PIX_FMT_VULKAN), .hw_configs = ff_vulkan_encode_hw_configs, .p.wrapper_name = "vulkan", }; commit eeff85f15d558e48ce7b2fa462db28627dd46afe Author: Niklas Haas <git(a)haasn.dev> AuthorDate: Tue Aug 5 23:13:39 2025 +0200 Commit: Lynne <dev(a)lynne.ee> CommitDate: Fri Aug 22 04:42:30 2025 +0900 avutil/hwcontext_vulkan: also re-query dprops in device_init() This can be unset if using an externally provided device, as in this case device_create() never gets called. (cherry picked from commit 881224b21324e5f0c43569928cf96f0e92a686e2) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index c8e1b7e576..77efa58db9 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1868,6 +1868,8 @@ static int vulkan_device_init(AVHWDeviceContext *ctx) p->props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; p->props.pNext = &p->hprops; p->hprops.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT; + p->hprops.pNext = &p->dprops; + p->dprops.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES; vk->GetPhysicalDeviceProperties2(hwctx->phys_dev, &p->props); av_log(ctx, AV_LOG_VERBOSE, "Using device: %s\n", ----------------------------------------------------------------------- Summary of changes: libavcodec/vulkan_encode_av1.c | 5 +---- libavcodec/vulkan_vp9.c | 29 +++++++++++++++-------------- libavfilter/vulkan/bwdif.comp | 2 +- libavutil/hwcontext_vulkan.c | 6 ++++-- 4 files changed, 21 insertions(+), 21 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 7caa2a65d9 avcodec/exif: fix some coverity errors
by ffmpeg-git＠ffmpeg.org 21 Aug '25

21 Aug '25

The branch, master has been updated via 7caa2a65d9d73848e0d4167fed86aac6780f4bbe (commit) from d4eb01f2814431aef1f4160a00ed495560ff35bd (commit) - Log ----------------------------------------------------------------- commit 7caa2a65d9d73848e0d4167fed86aac6780f4bbe Author: Leo Izen <leo.izen(a)gmail.com> AuthorDate: Wed Aug 20 21:40:28 2025 -0400 Commit: Leo Izen <leo.izen(a)gmail.com> CommitDate: Thu Aug 21 15:40:45 2025 -0400 avcodec/exif: fix some coverity errors This commit fixes some memory and security issues due to improper sanitizing and checks. Fixes: - CID 1665100..1665107 Signed-off-by: Leo Izen <leo.izen(a)gmail.com> Reportedy-by: James Almer <jamrial(a)gmail.com> diff --git a/libavcodec/exif.c b/libavcodec/exif.c index 48959eb9b3..2513ee4ec0 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -322,12 +322,17 @@ static int exif_read_values(void *logctx, GetByteContext *gb, int le, AVExifEntr break; case AV_TIFF_UNDEFINED: case AV_TIFF_BYTE: + /* these three fields are aliased to entry->value.ptr via a union */ + /* and entry->value.ptr will always be nonzero here */ + av_assert0(entry->value.ubytes); bytestream2_get_buffer(gb, entry->value.ubytes, entry->count); break; case AV_TIFF_SBYTE: + av_assert0(entry->value.sbytes); bytestream2_get_buffer(gb, entry->value.sbytes, entry->count); break; case AV_TIFF_STRING: + av_assert0(entry->value.str); bytestream2_get_buffer(gb, entry->value.str, entry->count); break; } @@ -471,6 +476,10 @@ static int exif_decode_tag(void *logctx, GetByteContext *gb, int le, av_log(logctx, AV_LOG_DEBUG, "TIFF Tag: id: 0x%04x, type: %d, count: %u, offset: %d, " "payload: %" PRIu32 "\n", entry->id, type, count, tell, payload); + /* AV_TIFF_IFD is the largest, numerically */ + if (type > AV_TIFF_IFD) + return AVERROR_INVALIDDATA; + is_ifd = type == AV_TIFF_IFD || ff_tis_ifd(entry->id) || entry->id == MAKERNOTE_TAG; if (is_ifd) { @@ -541,6 +550,11 @@ static int exif_parse_ifd_list(void *logctx, GetByteContext *gb, int le, av_log(logctx, AV_LOG_ERROR, "not enough bytes remaining in EXIF buffer. entries: %" PRIu32 "\n", entries); return AVERROR_INVALIDDATA; } + if (entries > 4096) { + /* that is a lot of entries, probably an error */ + av_log(logctx, AV_LOG_ERROR, "too many entries: %" PRIu32 "\n", entries); + return AVERROR_INVALIDDATA; + } ifd->count = entries; av_log(logctx, AV_LOG_DEBUG, "entry count for IFD: %u\n", ifd->count); @@ -729,7 +743,12 @@ int av_exif_write(void *logctx, const AVExifMetadata *ifd, AVBufferRef **buffer, if (header_mode != AV_EXIF_ASSUME_BE && header_mode != AV_EXIF_ASSUME_LE) { /* these constants are be32 in both cases */ - bytestream2_put_be32(&pb, le ? EXIF_II_LONG : EXIF_MM_LONG); + /* this is a #if instead of a ternary to suppress a deadcode warning */ +#if AV_HAVE_BIGENDIAN + bytestream2_put_be32(&pb, EXIF_MM_LONG); +#else + bytestream2_put_be32(&pb, EXIF_II_LONG); +#endif tput32(&pb, le, 8); } @@ -897,10 +916,10 @@ static int exif_ifd_to_dict(void *logctx, const char *prefix, const AVExifMetada if (ret < 0) goto end; ret = av_dict_set(metadata, key, value, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); - if (ret < 0) - goto end; key = NULL; value = NULL; + if (ret < 0) + goto end; } else { av_freep(&key); } @@ -970,7 +989,7 @@ static int exif_attach_ifd(void *logctx, AVFrame *frame, const AVExifMetadata *i ret = av_exif_ifd_to_dict(logctx, cloned ? cloned : ifd, &frame->metadata); if (ret < 0) - return ret; + goto end; if (cloned || !og) { ret = av_exif_write(logctx, cloned ? cloned : ifd, &written, AV_EXIF_TIFF_HEADER); ----------------------------------------------------------------------- Summary of changes: libavcodec/exif.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. d4eb01f281 avcodec/sanm: handle xpal cmd 0
by ffmpeg-git＠ffmpeg.org 21 Aug '25

21 Aug '25

The branch, master has been updated via d4eb01f2814431aef1f4160a00ed495560ff35bd (commit) from 6825f6f1e2fbce956dfdc97e48f7e39467584058 (commit) - Log ----------------------------------------------------------------- commit d4eb01f2814431aef1f4160a00ed495560ff35bd Author: Manuel Lauss <manuel.lauss(a)gmail.com> AuthorDate: Thu Aug 21 09:44:25 2025 +0200 Commit: michaelni <michael(a)niedermayer.cc> CommitDate: Thu Aug 21 16:24:26 2025 +0000 avcodec/sanm: handle xpal cmd 0 It's like cmd 2. Fixes the Rebel Assault 1 Intro Video "C1BLOCK.ANM" crossfade from planet view to space view and subsequent wrong colors. Signed-off-by: Manuel Lauss <manuel.lauss(a)gmail.com> diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index e4308af647..4cf1ac5221 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1888,7 +1888,7 @@ static int process_xpal(SANMVideoContext *ctx, int size) } *pal++ = 0xFFU << 24 | c[0] << 16 | c[1] << 8 | c[2]; } - } else if (cmd == 2) { + } else if (cmd == 0 || cmd == 2) { if (size < PALETTE_DELTA * 2 + 4) { av_log(ctx->avctx, AV_LOG_ERROR, "Incorrect palette change block size %"PRIu32".\n", size); ----------------------------------------------------------------------- Summary of changes: libavcodec/sanm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 6825f6f1e2 avfilter/vf_libplacebo: add bwdif option
by ffmpeg-git＠ffmpeg.org 21 Aug '25

21 Aug '25

The branch, master has been updated via 6825f6f1e2fbce956dfdc97e48f7e39467584058 (commit) from 5bd866b6ed3356dc7d5ab773e651b6ffb2c788e9 (commit) - Log ----------------------------------------------------------------- commit 6825f6f1e2fbce956dfdc97e48f7e39467584058 Author: Niklas Haas <git(a)haasn.dev> AuthorDate: Thu Aug 21 13:03:56 2025 +0200 Commit: Niklas Haas <ffmpeg(a)haasn.dev> CommitDate: Thu Aug 21 15:34:03 2025 +0000 avfilter/vf_libplacebo: add bwdif option See-Also: https://code.videolan.org/videolan/libplacebo/-/merge_requests/737 diff --git a/doc/filters.texi b/doc/filters.texi index e84d7d5554..4c774162e3 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16654,6 +16654,8 @@ No deinterlacing, weave fields together into a single frame. This is the default Naive bob deinterlacing, simply repeat each field line twice. @item yadif Yet another deinterlacing filter. See the @ref{yadif} filter for more details. +@item bwdif +Bob weaver deinterlacing filter. See the @ref{bwdif} filter for more details. @end table @item skip_spatial_check diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index af18a05258..c35473a44c 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -1609,6 +1609,9 @@ static const AVOption libplacebo_options[] = { { "weave", "Weave fields together (no-op)", 0, AV_OPT_TYPE_CONST, {.i64 = PL_DEINTERLACE_WEAVE}, 0, 0, STATIC, .unit = "deinterlace" }, { "bob", "Naive bob deinterlacing", 0, AV_OPT_TYPE_CONST, {.i64 = PL_DEINTERLACE_BOB}, 0, 0, STATIC, .unit = "deinterlace" }, { "yadif", "Yet another deinterlacing filter", 0, AV_OPT_TYPE_CONST, {.i64 = PL_DEINTERLACE_YADIF}, 0, 0, STATIC, .unit = "deinterlace" }, +#if PL_API_VER >= 353 + { "bwdif", "Bob weaver deinterlacing filter", 0, AV_OPT_TYPE_CONST, {.i64 = PL_DEINTERLACE_BWDIF}, 0, 0, STATIC, .unit = "deinterlace" }, +#endif { "skip_spatial_check", "Skip yadif spatial check", OFFSET(skip_spatial_check), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, { "send_fields", "Output a frame for each field", OFFSET(send_fields), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, ----------------------------------------------------------------------- Summary of changes: doc/filters.texi | 2 ++ libavfilter/vf_libplacebo.c | 3 +++ 2 files changed, 5 insertions(+) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 5bd866b6ed forgejo/workflows: cat config.log on configure failure
by ffmpeg-git＠ffmpeg.org 21 Aug '25

21 Aug '25

The branch, master has been updated via 5bd866b6ed3356dc7d5ab773e651b6ffb2c788e9 (commit) via 8591227e1f63360d5c994e1e07332e8d7322b157 (commit) from 8e0de5d811b1828d588844a88cea35440cce0008 (commit) - Log ----------------------------------------------------------------- commit 5bd866b6ed3356dc7d5ab773e651b6ffb2c788e9 Author: Timo Rothenpieler <timo(a)rothenpieler.org> AuthorDate: Mon Aug 18 22:58:58 2025 +0200 Commit: Timo Rothenpieler <timo(a)rothenpieler.org> CommitDate: Thu Aug 21 15:08:50 2025 +0000 forgejo/workflows: cat config.log on configure failure diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 540d64352b..6b5e483b39 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -21,7 +21,10 @@ jobs: - name: Configure run: | ./configure --enable-gpl --enable-nonfree --enable-memory-poisoning --assert-level=2 \ - $([ "${{ matrix.bits }}" != "32" ] || echo --arch=x86_32 --extra-cflags=-m32 --extra-cxxflags=-m32 --extra-ldflags=-m32) + $([ "${{ matrix.bits }}" != "32" ] || echo --arch=x86_32 --extra-cflags=-m32 --extra-cxxflags=-m32 --extra-ldflags=-m32) \ + || CFGRES=$? && CFGRES=$? + cat ffbuild/config.log + exit $CFGRES - name: Build run: make -j$(nproc) - name: Restore Cached Fate-Suite commit 8591227e1f63360d5c994e1e07332e8d7322b157 Author: Timo Rothenpieler <timo(a)rothenpieler.org> AuthorDate: Mon Aug 18 20:28:26 2025 +0200 Commit: Timo Rothenpieler <timo(a)rothenpieler.org> CommitDate: Thu Aug 21 15:08:50 2025 +0000 forgejo/workflows: also run 32bit fate tests diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 56e844ff4b..540d64352b 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -10,12 +10,18 @@ jobs: fail-fast: false matrix: runner: [linux-amd64,linux-aarch64] + bits: ['64'] + include: + - runner: linux-amd64 + bits: '32' runs-on: ${{ matrix.runner }} steps: - name: Checkout uses: actions/checkout@v4 - name: Configure - run: ./configure --enable-gpl --enable-nonfree --enable-memory-poisoning --assert-level=2 + run: | + ./configure --enable-gpl --enable-nonfree --enable-memory-poisoning --assert-level=2 \ + $([ "${{ matrix.bits }}" != "32" ] || echo --arch=x86_32 --extra-cflags=-m32 --extra-cxxflags=-m32 --extra-ldflags=-m32) - name: Build run: make -j$(nproc) - name: Restore Cached Fate-Suite ----------------------------------------------------------------------- Summary of changes: .forgejo/workflows/test.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 8e0de5d811 avfilter/setpts: also preserve duration when not stripping fps
by ffmpeg-git＠ffmpeg.org 21 Aug '25

21 Aug '25

The branch, master has been updated via 8e0de5d811b1828d588844a88cea35440cce0008 (commit) from 2796ce20d9a91193dbdca9aa980accfb9f2794b0 (commit) - Log ----------------------------------------------------------------- commit 8e0de5d811b1828d588844a88cea35440cce0008 Author: Niklas Haas <git(a)haasn.dev> AuthorDate: Thu Aug 21 14:46:52 2025 +0200 Commit: Niklas Haas <git(a)haasn.dev> CommitDate: Thu Aug 21 14:55:12 2025 +0200 avfilter/setpts: also preserve duration when not stripping fps It makes sense to treat the presence of a frame duration and the presence of frame rate metadata identically - because both convey effectively the same amount of information. In f121d95 and fa110c3 respectively, this information was stripped by default, originally to work-around bugs when changing the PTS information of a stream being fed to some encoders. (See https://trac.ffmpeg.org/ticket/10886) Later, commit 959b799c restored the ability to preserve the frame rate medatata via the `strip_fps` option, but this option did not extend to also include the frame duration. This commit resolves the scenario by making `frame_rate` and `duration` handled in a consistent manner, so that the frame rate information is generally preserved unless explicitly stripped by the user. While it does regress the exact invocation presented in the trac ticket unless using `strip_fps=yes`, I consider this an acceptable trade-off, especially in light of the fact that the `fps` filter also exists and is arguably the better tool for the task at hand. diff --git a/doc/filters.texi b/doc/filters.texi index 2818bd28b0..e84d7d5554 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -31911,9 +31911,9 @@ This filter accepts the following options: The expression which is evaluated for each frame to construct its timestamp. @item strip_fps (@emph{video only}) -Boolean option which determines if the original framerate metadata is unset. -If set to true, be advised that a sane frame rate should be explicitly -specified if output is sent to a constant frame rate muxer. +Boolean option which determines if the original framerate and frame duration +metadata is unset. If set to true, be advised that a sane frame rate should be +explicitly specified if output is sent to a constant frame rate muxer. Default is @code{false}. @end table diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 0565533ed2..b49a0cb64f 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -199,7 +199,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) d = eval_pts(setpts, inlink, frame, frame->pts); frame->pts = D2TS(d); - frame->duration = 0; + if (setpts->strip_fps) + frame->duration = 0; av_log(inlink->dst, AV_LOG_TRACE, "N:%"PRId64" PTS:%s T:%f", ----------------------------------------------------------------------- Summary of changes: doc/filters.texi | 6 +++--- libavfilter/setpts.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 2796ce20d9 avfilter/vf_colordetect: Reorder to avoid null pointer check
by ffmpeg-git＠ffmpeg.org 21 Aug '25

21 Aug '25

The branch, master has been updated via 2796ce20d9a91193dbdca9aa980accfb9f2794b0 (commit) from 4d7c609be37dc57d31527c8c9e5945dc9491a7cd (commit) - Log ----------------------------------------------------------------- commit 2796ce20d9a91193dbdca9aa980accfb9f2794b0 Author: Zhao Zhili <quinkblack(a)foxmail.com> AuthorDate: Thu Aug 21 11:01:35 2025 +0800 Commit: Zhao Zhili <quinkblack(a)foxmail.com> CommitDate: Thu Aug 21 11:01:35 2025 +0800 avfilter/vf_colordetect: Reorder to avoid null pointer check Follow the general practice to assign the C implementation to DSP, then the SIMD-optimized version. diff --git a/libavfilter/vf_colordetect.c b/libavfilter/vf_colordetect.c index a7fc98e2f1..88374ac3e2 100644 --- a/libavfilter/vf_colordetect.c +++ b/libavfilter/vf_colordetect.c @@ -229,19 +229,16 @@ static av_cold void uninit(AVFilterContext *ctx) av_cold void ff_color_detect_dsp_init(FFColorDetectDSPContext *dsp, int depth, enum AVColorRange color_range) { + dsp->detect_range = depth > 8 ? ff_detect_range16_c : ff_detect_range_c; + if (color_range == AVCOL_RANGE_JPEG) { + dsp->detect_alpha = depth > 8 ? ff_detect_alpha16_full_c : ff_detect_alpha_full_c; + } else { + dsp->detect_alpha = depth > 8 ? ff_detect_alpha16_limited_c : ff_detect_alpha_limited_c; + } + #if ARCH_X86 ff_color_detect_dsp_init_x86(dsp, depth, color_range); #endif - - if (!dsp->detect_range) - dsp->detect_range = depth > 8 ? ff_detect_range16_c : ff_detect_range_c; - if (!dsp->detect_alpha) { - if (color_range == AVCOL_RANGE_JPEG) { - dsp->detect_alpha = depth > 8 ? ff_detect_alpha16_full_c : ff_detect_alpha_full_c; - } else { - dsp->detect_alpha = depth > 8 ? ff_detect_alpha16_limited_c : ff_detect_alpha_limited_c; - } - } } static const AVFilterPad colordetect_inputs[] = { ----------------------------------------------------------------------- Summary of changes: libavfilter/vf_colordetect.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 4d7c609be3 .forgejo/CODEOWNERS: add myself for vp8, vp9, wmavoice and csp.
by ffmpeg-git＠ffmpeg.org 20 Aug '25

20 Aug '25

The branch, master has been updated via 4d7c609be37dc57d31527c8c9e5945dc9491a7cd (commit) from b9695c45c33c83f840d11a4aa82cd5fd281042b6 (commit) - Log ----------------------------------------------------------------- commit 4d7c609be37dc57d31527c8c9e5945dc9491a7cd Author: Ronald S. Bultje <rsbultje(a)gmail.com> AuthorDate: Wed Aug 20 12:56:54 2025 -0400 Commit: Ronald S. Bultje <rsbultje(a)gmail.com> CommitDate: Wed Aug 20 19:50:01 2025 +0000 .forgejo/CODEOWNERS: add myself for vp8, vp9, wmavoice and csp. diff --git a/.forgejo/CODEOWNERS b/.forgejo/CODEOWNERS index d24797119d..348bae580c 100644 --- a/.forgejo/CODEOWNERS +++ b/.forgejo/CODEOWNERS @@ -31,7 +31,11 @@ libavcodec/ratecontrol.* @michaelni libavcodec/.*siren.* @lynne libavcodec/smpte_436m.* @programmerjake libavcodec/.*vc2.* @lynne +libavcodec/vp8.* @rbultje +libavcodec/vp9.* @rbultje +libavcodec/vpx.* @rbultje libavcodec/.*vvc.* @frankplow @NuoMi @jianhuaw +libavcodec/wmavoice.* @rbultje # bitstream filters libavcodec/bsf/eia608_to_smpte436m.* @programmerjake @@ -42,14 +46,21 @@ libavcodec/aarch64/.* @lynne @mstorsjo libavcodec/arm/.* @mstorsjo libavcodec/ppc/.* @sean_mcg libavcodec/x86/.* @lynne +libavcodec/x86/vp8.* @rbultje +libavcodec/x86/vp9.* @rbultje +libavcodec/x86/vpx.* @rbultje # avfilter # ======= -libavfilter/aarch64/.* @mstorsjo libavfilter/af_whisper.* @vpalmisano +libavfilter/colorspace.* @rbultje +libavfilter/vf_colorspace.* @rbultje libavfilter/vf_yadif.* @michaelni libavfilter/vsrc_mandelbrot.* @michaelni +libavfilter/aarch64/.* @mstorsjo +libavfilter/x86/colorspace.* @rbultje + # avformat # ======= libavformat/alp.* @zane @@ -69,6 +80,7 @@ libavformat/scd.* @zane # ====== libavutil/.*crc.* @lynne @michaelni libavutil/.*d3d12va.* @jianhuaw +libavutil/csp.* @rbultje libavutil/eval.* @michaelni libavutil/iamf.* @jamrial libavutil/integer.* @michaelni ----------------------------------------------------------------------- Summary of changes: .forgejo/CODEOWNERS | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. b9695c45c3 forgejo/CODEOWNERS: add myself
by ffmpeg-git＠ffmpeg.org 20 Aug '25

20 Aug '25

The branch, master has been updated via b9695c45c33c83f840d11a4aa82cd5fd281042b6 (commit) from 67c15cf54156df469bb926d631fd9e21a259c9df (commit) - Log ----------------------------------------------------------------- commit b9695c45c33c83f840d11a4aa82cd5fd281042b6 Author: Jacob Lifshay <programmerjake(a)gmail.com> AuthorDate: Tue Aug 19 15:08:25 2025 -0700 Commit: michaelni <michael(a)niedermayer.cc> CommitDate: Wed Aug 20 18:17:14 2025 +0000 forgejo/CODEOWNERS: add myself Signed-off-by: Jacob Lifshay <programmerjake(a)gmail.com> diff --git a/.forgejo/CODEOWNERS b/.forgejo/CODEOWNERS index c5d6656e9b..d24797119d 100644 --- a/.forgejo/CODEOWNERS +++ b/.forgejo/CODEOWNERS @@ -29,9 +29,15 @@ libavcodec/.*prores.* @lynne libavcodec/rangecoder.* @michaelni libavcodec/ratecontrol.* @michaelni libavcodec/.*siren.* @lynne +libavcodec/smpte_436m.* @programmerjake libavcodec/.*vc2.* @lynne libavcodec/.*vvc.* @frankplow @NuoMi @jianhuaw +# bitstream filters +libavcodec/bsf/eia608_to_smpte436m.* @programmerjake +libavcodec/bsf/smpte436m_to_eia608.* @programmerjake + +# architecture-specific libavcodec/aarch64/.* @lynne @mstorsjo libavcodec/arm/.* @mstorsjo libavcodec/ppc/.* @sean_mcg @@ -54,6 +60,8 @@ libavformat/iamf.* @jamrial libavformat/.*jpegxl.* @Traneptora libavformat/.*jxl.* @Traneptora libavformat/kvag.* @zane +libavformat/mccdec.* @programmerjake +libavformat/mccenc.* @programmerjake libavformat/pp_bnk.* @zane libavformat/scd.* @zane @@ -102,3 +110,7 @@ doc/.* @GyanD # ========== .*d3d12va.* @jianhuaw .*vulkan.* @lynne + +# tests +# ===== +tests/ref/fate/sub-mcc.* @programmerjake ----------------------------------------------------------------------- Summary of changes: .forgejo/CODEOWNERS | 12 ++++++++++++ 1 file changed, 12 insertions(+) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 67c15cf541 avutil/hwcontext_vulkan: add debug option to avoid host ptr imports
by ffmpeg-git＠ffmpeg.org 20 Aug '25

20 Aug '25

The branch, master has been updated via 67c15cf54156df469bb926d631fd9e21a259c9df (commit) via a7efcbd0e325fb7f6fd820adab683efe8323751f (commit) via 78beb4f5f40c7fbd7fd89c93b8a10f0a08281eb1 (commit) via 881224b21324e5f0c43569928cf96f0e92a686e2 (commit) from d151d3aecbe2a478c44be7faca56caae1848ca87 (commit) - Log ----------------------------------------------------------------- commit 67c15cf54156df469bb926d631fd9e21a259c9df Author: Niklas Haas <git(a)haasn.dev> AuthorDate: Fri Aug 1 15:35:41 2025 +0200 Commit: Niklas Haas <ffmpeg(a)haasn.dev> CommitDate: Wed Aug 20 15:05:41 2025 +0000 avutil/hwcontext_vulkan: add debug option to avoid host ptr imports In some environments, these are prohibitively slow. Add a debug option to prefer memcpy instead of importing host pointers. diff --git a/doc/filters.texi b/doc/filters.texi index fbd1d1959b..2818bd28b0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -28755,6 +28755,10 @@ Allocates linear images. Does not apply to decoding. @item disable_multiplane Disables multiplane images. Does not apply to decoding. + +@item avoid_host_import +Avoids the use of dynamic host memory imports, in favor of a regular memcpy() +into a previously mapped buffer. @end table @item -filter_hw_device @var{name} diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 22fbd5d934..47f894f75f 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -153,6 +153,9 @@ typedef struct VulkanDevicePriv { /* Disable host image transfer */ int disable_host_transfer; + /* Prefer memcpy over dynamic host pointer imports */ + int avoid_host_import; + /* Maximum queues */ int limit_queues; } VulkanDevicePriv; @@ -1793,6 +1796,12 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, p->disable_multiplane = strtol(opt_d->value, NULL, 10); } + /* Disable host pointer imports (by default on nvidia) */ + p->avoid_host_import = p->dprops.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY; + opt_d = av_dict_get(opts, "avoid_host_import", NULL, 0); + if (opt_d) + p->avoid_host_import = strtol(opt_d->value, NULL, 10); + /* Set the public device feature struct and its pNext chain */ hwctx->device_features = p->feats.device; @@ -4472,7 +4481,7 @@ static int vulkan_transfer_frame(AVHWFramesContext *hwfc, } /* Setup buffers first */ - if (p->vkctx.extensions & FF_VK_EXT_EXTERNAL_HOST_MEMORY) { + if (p->vkctx.extensions & FF_VK_EXT_EXTERNAL_HOST_MEMORY && !p->avoid_host_import) { err = host_map_frame(hwfc, bufs, &nb_bufs, swf, region, upload); if (err >= 0) host_mapped = 1; commit a7efcbd0e325fb7f6fd820adab683efe8323751f Author: Niklas Haas <git(a)haasn.dev> AuthorDate: Tue Aug 5 23:19:41 2025 +0200 Commit: Niklas Haas <ffmpeg(a)haasn.dev> CommitDate: Wed Aug 20 15:05:41 2025 +0000 avutil/hwcontext_vulkan: check driver ID instead of hard-coded vendor check diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 4c7e81d540..22fbd5d934 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -155,9 +155,6 @@ typedef struct VulkanDevicePriv { /* Maximum queues */ int limit_queues; - - /* Nvidia */ - int dev_is_nvidia; } VulkanDevicePriv; typedef struct VulkanFramesPriv { @@ -1871,8 +1868,6 @@ static int vulkan_device_init(AVHWDeviceContext *ctx) av_log(ctx, AV_LOG_VERBOSE, " minImportedHostPointerAlignment: %"PRIu64"\n", p->hprops.minImportedHostPointerAlignment); - p->dev_is_nvidia = (p->props.properties.vendorID == 0x10de); - vk->GetPhysicalDeviceQueueFamilyProperties(hwctx->phys_dev, &qf_num, NULL); if (!qf_num) { av_log(ctx, AV_LOG_ERROR, "Failed to get queues!\n"); @@ -2891,7 +2886,7 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc) } /* Nvidia is violating the spec because they thought no one would use this. */ - if (p->dev_is_nvidia && + if (p->dprops.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY && (((fmt->nb_images == 1) && (fmt->vk_planes > 1)) || (av_pix_fmt_desc_get(hwfc->sw_format)->nb_components == 1))) supported_usage &= ~VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT; commit 78beb4f5f40c7fbd7fd89c93b8a10f0a08281eb1 Author: Niklas Haas <git(a)haasn.dev> AuthorDate: Tue Aug 5 23:18:21 2025 +0200 Commit: Niklas Haas <ffmpeg(a)haasn.dev> CommitDate: Wed Aug 20 15:05:41 2025 +0000 avutil/hwcontext_vulkan: don't re-query driver props in qf setup This is already queried when the device is selected, so there's no need to re-query the exact same struct. diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 4e078eb527..4c7e81d540 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1463,13 +1463,6 @@ static int setup_queue_families(AVHWDeviceContext *ctx, VkDeviceCreateInfo *cd) VulkanDevicePriv *p = ctx->hwctx; AVVulkanDeviceContext *hwctx = &p->p; FFVulkanFunctions *vk = &p->vkctx.vkfn; - VkPhysicalDeviceDriverProperties dprops = { - .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES, - }; - VkPhysicalDeviceProperties2 props2 = { - .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2, - .pNext = &dprops, - }; VkQueueFamilyProperties2 *qf = NULL; VkQueueFamilyVideoPropertiesKHR *qf_vid = NULL; @@ -1523,13 +1516,6 @@ static int setup_queue_families(AVHWDeviceContext *ctx, VkDeviceCreateInfo *cd) hwctx->nb_qf = 0; - /* NVIDIA's proprietary drivers have stupid limits, where each queue - * you allocate takes tens of milliseconds, and the more queues you - * allocate, the less you'll have left before initializing a device - * simply fails (112 seems to be the max). GLOBALLY. - * Detect this, and minimize using queues as much as possible. */ - vk->GetPhysicalDeviceProperties2(hwctx->phys_dev, &props2); - /* Pick each queue family to use. */ #define PICK_QF(type, vid_op) \ do { \ @@ -1555,7 +1541,7 @@ static int setup_queue_families(AVHWDeviceContext *ctx, VkDeviceCreateInfo *cd) hwctx->qf[i].idx = idx; \ hwctx->qf[i].num = qf[idx].queueFamilyProperties.queueCount; \ if (p->limit_queues || \ - dprops.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY) { \ + p->dprops.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY) { \ int max = p->limit_queues; \ if (type == VK_QUEUE_GRAPHICS_BIT) \ hwctx->qf[i].num = FFMIN(hwctx->qf[i].num, \ commit 881224b21324e5f0c43569928cf96f0e92a686e2 Author: Niklas Haas <git(a)haasn.dev> AuthorDate: Tue Aug 5 23:13:39 2025 +0200 Commit: Niklas Haas <ffmpeg(a)haasn.dev> CommitDate: Wed Aug 20 15:05:41 2025 +0000 avutil/hwcontext_vulkan: also re-query dprops in device_init() This can be unset if using an externally provided device, as in this case device_create() never gets called. diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 2e04e63212..4e078eb527 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1868,6 +1868,8 @@ static int vulkan_device_init(AVHWDeviceContext *ctx) p->props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; p->props.pNext = &p->hprops; p->hprops.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT; + p->hprops.pNext = &p->dprops; + p->dprops.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES; vk->GetPhysicalDeviceProperties2(hwctx->phys_dev, &p->props); av_log(ctx, AV_LOG_VERBOSE, "Using device: %s\n", ----------------------------------------------------------------------- Summary of changes: doc/filters.texi | 4 ++++ libavutil/hwcontext_vulkan.c | 36 ++++++++++++++---------------------- 2 files changed, 18 insertions(+), 22 deletions(-) hooks/post-receive --

1 0