May 2025 - ffmpeg-devel - lists.ffmpeg.org

[PATCH 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2
by ffmpegagent 17 Jun '25

17 Jun '25

When setting up the new Patchword builders I noticed some issues when running FATE tests on Windows. Initially I had them suppressed on the builders, but this patchset should finally fix it. softworkz (3): tests/fate: Fix subtitle fate tests on Windows tests/source-check: Fix make inclusion-guard check EOL-agnostic tests/hevc: Fix concat input when running in MSYS2 shell .gitattributes | 38 +++++++++++++++++++++++++++++++++++++- tests/fate/hevc.mak | 2 +- tests/fate/source-check.sh | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) base-commit: 4014784b6229fe0829c2b154694fc13fcb963864 Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-77%2Fsoftwork… Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-77/softworkz/submit_fate_subs_eol-v1 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/77 -- ffmpeg-codebot

6 21

[PATCH] avutil/hwcontext_vulkan: Query the correct format
by Link Mauve 16 Jun '25

16 Jun '25

In the call to vkGetPhysicalDeviceImageFormatProperties2(), we were previously requesting the properties of the first fallback format (e.g. VK_FORMAT_R8_UNORM for VK_FORMAT_G8_B8R8_2PLANE_420_UNORM) instead of the actual format in use. We don’t do anything with it afterwards, but there is no reason to keep querying the wrong format. --- libavutil/hwcontext_vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 35321bb063..0394ce1eba 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -2591,7 +2591,7 @@ static void try_export_flags(AVHWFramesContext *hwfc, VkPhysicalDeviceImageFormatInfo2 pinfo = { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2, .pNext = !exp ? NULL : &enext, - .format = av_vkfmt_from_pixfmt(hwfc->sw_format)[0], + .format = vk_find_format_entry(hwfc->sw_format)->vkf, .type = VK_IMAGE_TYPE_2D, .tiling = hwctx->tiling, .usage = hwctx->usage, -- 2.49.0

3 2

[PATCH v2] avcodec/libwebpdec: Add libwebp WebP decoder.
by Peter Xia 16 Jun '25

16 Jun '25

Adds support of decoding animated webp. Signed-off-by: Peter Xia <aattyy(a)gmail.com> --- Changelog | 1 + configure | 4 +- doc/general_contents.texi | 2 +- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 3 +- libavcodec/libwebpdec.c | 192 ++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 7 files changed, 201 insertions(+), 4 deletions(-) create mode 100644 libavcodec/libwebpdec.c diff --git a/Changelog b/Changelog index a03a79d17a..4635e16c05 100644 --- a/Changelog +++ b/Changelog @@ -12,6 +12,7 @@ version <next>: - Animated JPEG XL encoding (via libjxl) - VVC in Matroska - CENC AV1 support in MP4 muxer +- Animated WebP decoding version 7.1: - Raw Captions with Time (RCWT) closed caption demuxer diff --git a/configure b/configure index 6942e92636..e63fd38601 100755 --- a/configure +++ b/configure @@ -3611,6 +3611,7 @@ libvpx_vp9_encoder_deps="libvpx" libvvenc_encoder_deps="libvvenc" libwebp_encoder_deps="libwebp" libwebp_anim_encoder_deps="libwebp" +libwebp_decoder_deps="libwebp" libx262_encoder_deps="libx262" libx264_encoder_deps="libx264" libx264_encoder_select="atsc_a53 golomb" @@ -7086,7 +7087,8 @@ enabled libvpx && { enabled libvvenc && require_pkg_config libvvenc "libvvenc >= 1.6.1" "vvenc/vvenc.h" vvenc_get_version enabled libwebp && { enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion - enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } + enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit + enabled libwebp_decoder && check_pkg_config libwebp_decoder "libwebpdemux >= 1.5.0" webp/demux.h WebPAnimDecoderOptionsInitInternal; } enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && require_cpp_condition libx264 x264.h "X264_BUILD >= 155" && { [ "$toolchain" != "msvc" ] || diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 5faf89815b..4f10c3e34a 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -857,7 +857,7 @@ following image formats are supported: @item WBMP @tab X @tab X @tab Wireless Application Protocol Bitmap image format @item WebP @tab E @tab X - @tab WebP image format, encoding supported through external library libwebp + @tab WebP image format, supported through external library libwebp @item XBM @tab X @tab X @tab X BitMap image format @item XFace @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3c3ac640e0..bce5e45a79 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1179,6 +1179,7 @@ OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o OBJS-$(CONFIG_LIBVVENC_ENCODER) += libvvenc.o OBJS-$(CONFIG_LIBWEBP_ENCODER) += libwebpenc_common.o libwebpenc.o OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER) += libwebpenc_common.o libwebpenc_animencoder.o +OBJS-$(CONFIG_LIBWEBP_DECODER) += libwebpdec.o OBJS-$(CONFIG_LIBX262_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index f10519617e..5f8f682111 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -810,8 +810,9 @@ extern FFCodec ff_libvpx_vp9_encoder; extern const FFCodec ff_libvpx_vp9_decoder; extern const FFCodec ff_libvvenc_encoder; /* preferred over libwebp */ -extern const FFCodec ff_libwebp_anim_encoder; extern const FFCodec ff_libwebp_encoder; +extern const FFCodec ff_libwebp_anim_encoder; +extern const FFCodec ff_libwebp_decoder; extern const FFCodec ff_libx262_encoder; extern const FFCodec ff_libx264_encoder; extern const FFCodec ff_libx264rgb_encoder; diff --git a/libavcodec/libwebpdec.c b/libavcodec/libwebpdec.c new file mode 100644 index 0000000000..e9ca65ef05 --- /dev/null +++ b/libavcodec/libwebpdec.c @@ -0,0 +1,192 @@ +/* + * LibWebP decoder + * Copyright (c) 2025 Peter Xia + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * LibWebP decoder + */ + +#include "decode.h" +#include "codec_internal.h" +#include "libavutil/avutil.h" +#include "libavutil/opt.h" +#include "libavformat/avformat.h" +#include "libavformat/avio.h" + +#include <webp/demux.h> +#include <webp/decode.h> + +typedef struct AnimatedWebPContext +{ + const AVClass *class; + WebPAnimDecoderOptions dec_options; + WebPAnimDecoder *dec; + AVBufferRef *file_content; + WebPData webp_data; // references |file_content| + uint32_t loop_to_send; + uint32_t loop_sent; + + // --- Options --- + int ignore_loop; +} AnimatedWebPContext; + +// Initialize the decoder context +static av_cold int decode_libwebp_init(AVCodecContext *avctx) +{ + AnimatedWebPContext *s = avctx->priv_data; + + if (!WebPAnimDecoderOptionsInit(&s->dec_options)) { + av_log(avctx, AV_LOG_DEBUG, "Cannot initialize WebPAnimDecoderOptions\n"); + return AVERROR(ENOMEM); + } + s->dec_options.color_mode = MODE_RGBA; + s->dec_options.use_threads = 1; + s->file_content = NULL; + s->loop_sent = 0; + + avctx->pix_fmt = AV_PIX_FMT_RGBA; + avctx->pkt_timebase = av_make_q(1, 1000); + avctx->framerate = av_make_q(1, 0); + + av_log(avctx, AV_LOG_DEBUG, "Animated WebP decoder initialized.\n"); + return 0; // Success +} + +/** + * Decode one frame of the animated WebP. + * This function will be called multiple times by FFmpeg. + * The first call receives the AVPacket with the full WebP file. + * Subsequent calls receive empty AVPacket until all frames are decoded. + */ +static int decode_libwebp_frame(AVCodecContext *avctx, AVFrame *p, + int *got_frame, AVPacket *avpkt) +{ + WebPAnimInfo anim_info; + uint8_t *frame_rgba; + int timestamp_ms; + + AnimatedWebPContext *s = avctx->priv_data; + int ret = avpkt->size; + + // Initialization Phase (First Call) + // |avpkt| contains the entire file. + if (!s->dec) { + if (!avpkt || avpkt->size <= 0) { + // Should not happen on the first call, but check anyway. + av_log(avctx, AV_LOG_ERROR, "No input data provided on first call.\n"); + return AVERROR(EINVAL); + } + + // Store entire WebP file in memory. + s->file_content = av_buffer_ref(avpkt->buf); + s->webp_data.bytes = s->file_content->data; + s->webp_data.size = s->file_content->size; + + s->dec = WebPAnimDecoderNew(&s->webp_data, &s->dec_options); + if (!s->dec) { + av_log(avctx, AV_LOG_ERROR, "Error creating WebPAnimDecoder.\n"); + av_buffer_unref(&s->file_content); + return AVERROR(ENOMEM); + } + + WebPAnimDecoderGetInfo(s->dec, &anim_info); + + s->loop_to_send = s->ignore_loop ? 1 : anim_info.loop_count; + avctx->width = anim_info.canvas_width; + avctx->coded_width = anim_info.canvas_width; + avctx->height = anim_info.canvas_height; + avctx->coded_height = anim_info.canvas_height; + avctx->framerate = av_make_q(1, 0); + } + + if (!WebPAnimDecoderHasMoreFrames(s->dec)) { + s->loop_sent++; + WebPAnimDecoderReset(s->dec); + } + + if (s->loop_sent >= s->loop_to_send) { + av_log(avctx, AV_LOG_DEBUG, "End of animated WebP stream.\n"); + return AVERROR_EOF; + } + + + if (!WebPAnimDecoderGetNext(s->dec, &frame_rgba, &timestamp_ms)) { + av_log(avctx, AV_LOG_ERROR, "Error getting next frame from WebPAnimDecoder.\n"); + return AVERROR(EINVAL); + } + + ret = ff_get_buffer(avctx, p, 0); + if (ret) { + av_log(avctx, AV_LOG_ERROR, "Failed to allocated buffer.\n"); + return AVERROR(ENOMEM); + } + + p->width = avctx->width; + p->height = avctx->height; + p->format = AV_PIX_FMT_RGBA; + p->pts = timestamp_ms; + p->pkt_dts = 0; + p->pict_type = AV_PICTURE_TYPE_I; + + memcpy(p->data[0], frame_rgba, p->width * p->height * 4); + + *got_frame = 1; + return ret; +} + +static av_cold int decode_libwebp_close(AVCodecContext *avctx) +{ + AnimatedWebPContext *s = avctx->priv_data; + av_buffer_unref(&s->file_content); + if (s->dec) { + WebPAnimDecoderDelete(s->dec); + s->dec = NULL; + } + return 0; +} + +static const AVOption options[] = { + { "ignore_loop", "ignore loop setting (netscape extension)", offsetof(AnimatedWebPContext, ignore_loop), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM} , + { NULL }, +}; + +static const AVClass libwebp_decoder_class = { + .class_name = "libwebp_decoder", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DECODER, +}; + +// Define the AVCodec structure for FFmpeg +const FFCodec ff_libwebp_decoder = { + .p.name = "libwebp", + CODEC_LONG_NAME("libwebp image/animation decoder"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_WEBP, + .p.priv_class = &libwebp_decoder_class, + .priv_data_size = sizeof(AnimatedWebPContext), + .p.wrapper_name = "libwebp", + .init = decode_libwebp_init, + FF_CODEC_DECODE_CB(decode_libwebp_frame), + .close = decode_libwebp_close, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 0d4156e74a..026609f410 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 0 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ -- 2.39.5 (Apple Git-154)

3 5

[PATCH] avformat/hls: fix typo There is an extra space in the original comment
by Jack Lau 15 Jun '25

15 Jun '25

--- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 3bdc1bc848..c2130bb883 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1993,7 +1993,7 @@ static int hls_read_header(AVFormatContext *s) return ret; /* XXX: Some HLS servers don't like being sent the range header, - in this case, need to setting http_seekable = 0 to disable + in this case, need to setting http_seekable = 0 to disable the range header */ av_dict_set_int(&c->avio_opts, "seekable", c->http_seekable, 0); -- 2.48.1

4 7

[PATCH] add yuv444p support to mcdeint
by Ethan Halsall 14 Jun '25

14 Jun '25

Signed-off-by: Ethan Halsall <ethanhalsall11(a)augustana.edu> --- libavfilter/vf_mcdeint.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index 82048b51d0..11ad19f5cd 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -51,8 +51,10 @@ #include "libavutil/opt.h" #include "libavcodec/avcodec.h" +#include "libavutil/pixdesc.h" #include "avfilter.h" #include "filters.h" +#include "formats.h" #include "video.h" enum MCDeintMode { @@ -76,6 +78,7 @@ typedef struct MCDeintContext { AVPacket *pkt; AVFrame *frame_dec; AVCodecContext *enc_ctx; + const AVPixFmtDescriptor *pix_fmt_desc; } MCDeintContext; #define OFFSET(x) offsetof(MCDeintContext, x) @@ -99,6 +102,17 @@ static const AVOption mcdeint_options[] = { AVFILTER_DEFINE_CLASS(mcdeint); +static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV444P, + AV_PIX_FMT_NONE +}; + +static int query_formats(AVFilterContext *ctx) +{ + return ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); +} + static int config_props(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -122,13 +136,16 @@ static int config_props(AVFilterLink *inlink) mcdeint->enc_ctx = avcodec_alloc_context3(enc); if (!mcdeint->enc_ctx) return AVERROR(ENOMEM); + mcdeint->pix_fmt_desc = av_pix_fmt_desc_get(inlink->format); + if (!mcdeint->pix_fmt_desc) + return AVERROR(ENOMEM); enc_ctx = mcdeint->enc_ctx; enc_ctx->width = inlink->w; enc_ctx->height = inlink->h; enc_ctx->time_base = (AVRational){1,25}; // meaningless enc_ctx->gop_size = INT_MAX; enc_ctx->max_b_frames = 0; - enc_ctx->pix_fmt = AV_PIX_FMT_YUV420P; + enc_ctx->pix_fmt = inlink->format; enc_ctx->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY | AV_CODEC_FLAG_RECON_FRAME; enc_ctx->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; enc_ctx->global_quality = 1; @@ -201,8 +218,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) for (i = 0; i < 3; i++) { int is_chroma = !!i; - int w = AV_CEIL_RSHIFT(inlink->w, is_chroma); - int h = AV_CEIL_RSHIFT(inlink->h, is_chroma); + int w, h; + if (is_chroma) { + w = inlink->w >> mcdeint->pix_fmt_desc->log2_chroma_w; + h = inlink->h >> mcdeint->pix_fmt_desc->log2_chroma_h; + } else { + w = inlink->w; + h = inlink->h; + } int fils = frame_dec->linesize[i]; int srcs = inpic ->linesize[i]; int dsts = outpic ->linesize[i]; @@ -307,5 +330,6 @@ const FFFilter ff_vf_mcdeint = { .uninit = uninit, FILTER_INPUTS(mcdeint_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), - FILTER_SINGLE_PIXFMT(AV_PIX_FMT_YUV420P), + FILTER_QUERY_FUNC(query_formats), }; + -- 2.43.0

2 8

[PATCH v2] avformat/http: Add max_request_size option
by Nicolas Frattaroli 14 Jun '25

14 Jun '25

In some cases, webservers may return content more quickly if one sends many small requests rather than one big request. Clients may wish to opt-in to this workaround. For this purpose, add a max_request_size AVOption, which returns EOF if max_request_size is exceeded, causing a new request with an offset to be issued. In particular, this hack is useful for mpv, where it can be used to bypass YouTube's throttling. Signed-off-by: Nicolas Frattaroli <ffmpeg(a)fratti.ch> --- Changes in v2: - Fix the request hanging if s->filesize < max_request_size --- libavformat/http.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index ec60bc0b17..977cc8df7e 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -75,7 +75,7 @@ typedef struct HTTPContext { /* Used if "Transfer-Encoding: chunked" otherwise -1. */ uint64_t chunksize; int chunkend; - uint64_t off, end_off, filesize; + uint64_t off, end_off, filesize, max_request_size, range_end; char *uri; char *location; HTTPAuthState auth_state; @@ -174,6 +174,7 @@ static const AVOption options[] = { { "location", "The actual location of the data received", OFFSET(location), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, { "offset", "initial byte offset", OFFSET(off), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, D }, { "end_offset", "try to limit the request to bytes preceding this offset", OFFSET(end_off), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, D }, + { "max_request_size", "try to limit the request to this many bytes, then reconnect", OFFSET(max_request_size), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, D }, { "method", "Override the HTTP method or set the expected HTTP method from a client", OFFSET(method), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, { "reconnect", "auto reconnect after disconnect before EOF", OFFSET(reconnect), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, D }, { "reconnect_at_eof", "auto reconnect at EOF", OFFSET(reconnect_at_eof), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, D }, @@ -1522,10 +1523,16 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, // Note: we send the Range header on purpose, even when we're probing, // since it allows us to detect more reliably if a (non-conforming) // server supports seeking by analysing the reply headers. - if (!has_header(s->headers, "\r\nRange: ") && !post && (s->off > 0 || s->end_off || s->seekable != 0)) { + if (!has_header(s->headers, "\r\nRange: ") && !post && (s->off > 0 || s->end_off || s->seekable != 0 || s->max_request_size)) { av_bprintf(&request, "Range: bytes=%"PRIu64"-", s->off); - if (s->end_off) - av_bprintf(&request, "%"PRId64, s->end_off - 1); + if (s->end_off || s->max_request_size) { + if (s->end_off && s->max_request_size) { + s->range_end = FFMIN(s->end_off, s->off + s->max_request_size); + } else { + s->range_end = FFMAX(s->end_off, s->off + s->max_request_size); + } + av_bprintf(&request, "%"PRId64, s->range_end - 1); + } av_bprintf(&request, "\r\n"); } if (send_expect_100 && !has_header(s->headers, "\r\nExpect: ")) @@ -1664,7 +1671,16 @@ static int http_buf_read(URLContext *h, uint8_t *buf, int size) memcpy(buf, s->buf_ptr, len); s->buf_ptr += len; } else { - uint64_t target_end = s->end_off ? s->end_off : s->filesize; + uint64_t target_end = s->filesize; + if (s->end_off || s->max_request_size) { + if (s->end_off && s->max_request_size) { + target_end = FFMIN(s->end_off, s->range_end); + } else { + target_end = FFMAX(s->end_off, s->range_end); + } + target_end = FFMIN(target_end, s->filesize); + } + if ((!s->willclose || s->chunksize == UINT64_MAX) && s->off >= target_end) return AVERROR_EOF; len = ffurl_read(s->hd, buf, size); @@ -1762,13 +1778,16 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size) reconnect_delay_total > s->reconnect_delay_total_max) return AVERROR(EIO); - av_log(h, AV_LOG_WARNING, "Will reconnect at %"PRIu64" in %d second(s), error=%s.\n", s->off, reconnect_delay, av_err2str(read_ret)); - err = ff_network_sleep_interruptible(1000U*1000*reconnect_delay, &h->interrupt_callback); - if (err != AVERROR(ETIMEDOUT)) - return err; - reconnect_delay_total += reconnect_delay; - reconnect_delay = 1 + 2*reconnect_delay; - conn_attempts++; + if (!(s->max_request_size > 0 && read_ret == AVERROR_EOF)) { + av_log(h, AV_LOG_WARNING, "Will reconnect at %"PRIu64" in %d second(s), error=%s.\n", + s->off, reconnect_delay, av_err2str(read_ret)); + err = ff_network_sleep_interruptible(1000U*1000*reconnect_delay, &h->interrupt_callback); + if (err != AVERROR(ETIMEDOUT)) + return err; + reconnect_delay_total += reconnect_delay; + reconnect_delay = 1 + 2*reconnect_delay; + conn_attempts++; + } seek_ret = http_seek_internal(h, target, SEEK_SET, 1); if (seek_ret >= 0 && seek_ret != target) { av_log(h, AV_LOG_ERROR, "Failed to reconnect at %"PRIu64".\n", target); -- 2.47.1

4 5

[PATCH] avformat/dvdvideodec: fix seeking on multi-angle discs
by Marth64 14 Jun '25

14 Jun '25

When seeking on multi-angle titles, libdvdnav does not lock on to the correct sectors initially as it seeks to find the right NAV packet. This manifests itself as two bugs: (1) When seeking on the first angle in a multi-angle segment, frames from another angle will appear (for example in intro or credits scenes). This issue is present in VLC also. (2) When seeking during a segment on angle n+1, the demuxer cannot deduce the right position from dvdnav and does not allow seeking within the segment (due to it maintaining a strict state). Correct the issue by switching to angle 1 before doing the seek operation, and skipping 3 VOBUs (NAV packet led segments) ahead where dvdnav will have positioned itself correctly. Reported-by: Kacper Michajlow <kasper93(a)gmail.com> Signed-off-by: Marth64 <marth64(a)proxyid.net> --- libavformat/dvdvideodec.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index 5b9abebbf2..9596468ce2 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -111,6 +111,7 @@ typedef struct DVDVideoPlaybackState { int in_vts; /* if our navigator is in the VTS */ int is_seeking; /* relax navigation path while seeking */ int64_t nav_pts; /* PTS according to IFO, not frame-accurate */ + int nb_vobu_skip; /* number of VOBUs we should skip */ uint64_t pgc_duration_est; /* estimated duration as reported by IFO */ uint64_t pgc_elapsed; /* the elapsed time of the PGC, cell-relative */ int pgc_nb_pg_est; /* number of PGs as reported by IFOs */ @@ -165,6 +166,7 @@ typedef struct DVDVideoDemuxContext { /* playback control */ int64_t first_pts; /* the PTS of the first video keyframe */ + int nb_angles; /* number of angles in the current title */ int play_started; /* signal that playback has started */ DVDVideoPlaybackState play_state; /* the active playback state */ int64_t *prev_pts; /* track the previous PTS emitted per stream */ @@ -298,6 +300,8 @@ static int dvdvideo_ifo_open(AVFormatContext *s) return AVERROR_INVALIDDATA; } + c->nb_angles = title_info.nr_of_angles; + return 0; } @@ -759,6 +763,13 @@ static int dvdvideo_play_next_ps_block(AVFormatContext *s, DVDVideoPlaybackState return AVERROR_INVALIDDATA; } + if (state->nb_vobu_skip > 0) { + av_log(s, AV_LOG_VERBOSE, "Skipping VOBU at SCR %d\n", + e_dsi->dsi_gi.nv_pck_scr); + state->nb_vobu_skip -= 1; + continue; + } + state->vobu_duration = e_pci->pci_gi.vobu_e_ptm - e_pci->pci_gi.vobu_s_ptm; state->pgc_elapsed += state->vobu_duration; state->nav_pts = dvdnav_get_current_time(state->dvdnav); @@ -1736,6 +1747,7 @@ static int dvdvideo_read_seek(AVFormatContext *s, int stream_index, int64_t time int64_t new_nav_pts; pci_t* new_nav_pci; dsi_t* new_nav_dsi; + int seek_failed = 0; if (c->opt_menu || c->opt_chapter_start > 1) { av_log(s, AV_LOG_ERROR, "Seeking is not compatible with menus or chapter extraction\n"); @@ -1755,9 +1767,30 @@ static int dvdvideo_read_seek(AVFormatContext *s, int stream_index, int64_t time c->seek_warned = 1; } + /* dvdnav loses NAV packets when seeking on multi-angle discs, so enforce angle 1 then revert */ + if (c->nb_angles > 1) { + if (dvdnav_angle_change(c->play_state.dvdnav, 1) != DVDNAV_STATUS_OK) { + av_log(s, AV_LOG_ERROR, "Unable to open angle 1 for seeking\n"); + + return AVERROR_EXTERNAL; + } + } + /* XXX(PATCHWELCOME): use dvdnav_jump_to_sector_by_time(c->play_state.dvdnav, timestamp, 0) * when it is available in a released version of libdvdnav; it is more accurate */ if (dvdnav_time_search(c->play_state.dvdnav, timestamp) != DVDNAV_STATUS_OK) { + seek_failed = 1; + } + + if (c->nb_angles > 1) { + if (dvdnav_angle_change(c->play_state.dvdnav, c->opt_angle) != DVDNAV_STATUS_OK) { + av_log(s, AV_LOG_ERROR, "Unable to revert to angle %d after seeking\n", c->opt_angle); + + return AVERROR_EXTERNAL; + } + } + + if (seek_failed) { av_log(s, AV_LOG_ERROR, "libdvdnav: seeking to %" PRId64 " failed\n", timestamp); return AVERROR_EXTERNAL; @@ -1781,6 +1814,9 @@ static int dvdvideo_read_seek(AVFormatContext *s, int stream_index, int64_t time c->play_state.ptm_discont = 0; c->play_state.vobu_e_ptm = new_nav_pci->pci_gi.vobu_s_ptm; + /* if there are multiple angles, skip the next 3 VOBUs as dvdnav will be at the wrong angle */ + c->play_state.nb_vobu_skip = c->nb_angles > 1 ? 3 : 0; + c->first_pts = 0; c->play_started = 0; c->pts_offset = timestamp; -- 2.34.1

1 2

[PATCH 1/4] fftools/cmdutils: allow arbitrary length paths for preset files
by Marton Balint 14 Jun '25

14 Jun '25

Signed-off-by: Marton Balint <cus(a)passwd.hu> --- fftools/cmdutils.c | 17 ++++++++++------- fftools/cmdutils.h | 4 ++-- fftools/ffmpeg_opt.c | 14 +++++++++----- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index be21ed2c6c..e516ee6ebd 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -920,7 +920,7 @@ int read_yesno(void) return yesno; } -FILE *get_preset_file(char *filename, size_t filename_size, +FILE *get_preset_file(AVBPrint *filename, const char *preset_name, int is_path, const char *codec_name) { @@ -936,8 +936,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, FFMPEG_DATADIR, }; if (is_path) { - av_strlcpy(filename, preset_name, filename_size); - f = fopen_utf8(filename, "r"); + av_bprintf(filename, "%s", preset_name); + if (av_bprint_is_complete(filename)) + f = fopen_utf8(filename->str, "r"); } else { #if HAVE_GETMODULEHANDLE && defined(_WIN32) wchar_t *datadir_w = get_module_filename(NULL); @@ -971,15 +972,17 @@ FILE *get_preset_file(char *filename, size_t filename_size, for (i = 0; i < 3 && !f; i++) { if (!base[i]) continue; - snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i], + av_bprint_clear(filename); + av_bprintf(filename, "%s%s/%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", preset_name); - f = fopen_utf8(filename, "r"); + f = fopen_utf8(filename->str, "r"); if (!f && codec_name) { - snprintf(filename, filename_size, + av_bprint_clear(filename); + av_bprintf(filename, "%s%s/%s-%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", codec_name, preset_name); - f = fopen_utf8(filename, "r"); + f = fopen_utf8(filename->str, "r"); } } } diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index ad020f893a..216a2bcfe7 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -28,6 +28,7 @@ #include "libavcodec/avcodec.h" #include "libavfilter/avfilter.h" #include "libavformat/avformat.h" +#include "libavutil/bprint.h" #include "libswscale/swscale.h" #ifdef _WIN32 @@ -495,13 +496,12 @@ int read_yesno(void); * codec_name-preset_name.avpreset in the above-mentioned directories. * * @param filename buffer where the name of the found filename is written - * @param filename_size size in bytes of the filename buffer * @param preset_name name of the preset to search * @param is_path tell if preset_name is a filename path * @param codec_name name of the codec for which to look for the * preset, may be NULL */ -FILE *get_preset_file(char *filename, size_t filename_size, +FILE *get_preset_file(AVBPrint *filename, const char *preset_name, int is_path, const char *codec_name); /** diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 3d1efe32f9..aafacb8f1c 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -42,6 +42,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/avutil.h" +#include "libavutil/bprint.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" #include "libavutil/opt.h" @@ -1017,13 +1018,15 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) { OptionsContext *o = optctx; FILE *f=NULL; - char filename[1000], line[1000], tmp_line[1000]; + char line[1000], tmp_line[1000]; + AVBPrint filename; const char *codec_name = NULL; int ret = 0; codec_name = opt_match_per_type_str(&o->codec_names, *opt); + av_bprint_init(&filename, 0, AV_BPRINT_SIZE_UNLIMITED); - if (!(f = get_preset_file(filename, sizeof(filename), arg, *opt == 'f', codec_name))) { + if (!(f = get_preset_file(&filename, arg, *opt == 'f', codec_name))) { if(!strncmp(arg, "libx264-lossless", strlen("libx264-lossless"))){ av_log(NULL, AV_LOG_FATAL, "Please use -preset <speed> -qp 0\n"); }else @@ -1039,11 +1042,11 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) av_strlcpy(tmp_line, line, sizeof(tmp_line)); if (!av_strtok(key, "=", &value) || !av_strtok(value, "\r\n", &endptr)) { - av_log(NULL, AV_LOG_FATAL, "%s: Invalid syntax: '%s'\n", filename, line); + av_log(NULL, AV_LOG_FATAL, "%s: Invalid syntax: '%s'\n", filename.str, line); ret = AVERROR(EINVAL); goto fail; } - av_log(NULL, AV_LOG_DEBUG, "ffpreset[%s]: set '%s' = '%s'\n", filename, key, value); + av_log(NULL, AV_LOG_DEBUG, "ffpreset[%s]: set '%s' = '%s'\n", filename.str, key, value); if (!strcmp(key, "acodec")) opt_audio_codec (o, key, value); else if (!strcmp(key, "vcodec")) opt_video_codec (o, key, value); @@ -1051,7 +1054,7 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) else if (!strcmp(key, "dcodec")) opt_data_codec (o, key, value); else if (opt_default_new(o, key, value) < 0) { av_log(NULL, AV_LOG_FATAL, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", - filename, line, key, value); + filename.str, line, key, value); ret = AVERROR(EINVAL); goto fail; } @@ -1059,6 +1062,7 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) fail: fclose(f); + av_bprint_finalize(&filename, NULL); return ret; } -- 2.43.0

3 9

[PATCH 1/2] avcodec/libaom: Add HDR10+ metadata support
by Maryla Ustarroz-Calonge 13 Jun '25

13 Jun '25

Signed-off-by: Maryla Ustarroz-Calonge <maryla(a)google.com> --- libavcodec/libaomdec.c | 62 ++++++++++++++++++++++++++++++++++++++++++ libavcodec/libaomenc.c | 60 ++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 3 files changed, 123 insertions(+), 1 deletion(-) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 69eec8b089..5995f0ab9b 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -28,11 +28,15 @@ #include "libavutil/common.h" #include "libavutil/cpu.h" +#include "libavutil/hdr_dynamic_metadata.h" #include "libavutil/imgutils.h" +#include "libavcodec/bytestream.h" + #include "avcodec.h" #include "codec_internal.h" #include "decode.h" +#include "itut35.h" #include "libaom.h" #include "profiles.h" @@ -137,6 +141,59 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) } } +static int decode_metadata_itu_t_t35(AVFrame *frame, + const uint8_t *buffer, size_t buffer_size) +{ + if (buffer_size < 6) + return AVERROR(EINVAL); + + GetByteContext bc; + bytestream2_init(&bc, buffer, buffer_size); + + const int country_code = bytestream2_get_byteu(&bc); + const int provider_code = bytestream2_get_be16u(&bc); + const int provider_oriented_code = bytestream2_get_be16u(&bc); + const int application_identifier = bytestream2_get_byteu(&bc); + + if (country_code == ITU_T_T35_COUNTRY_CODE_US + && provider_code == ITU_T_T35_PROVIDER_CODE_SMTPE + && provider_oriented_code == 1 + && application_identifier == 4) { + // HDR10+ + AVDynamicHDRPlus *hdr_plus = av_dynamic_hdr_plus_create_side_data(frame); + if (!hdr_plus) + return AVERROR(ENOMEM); + + int res = av_dynamic_hdr_plus_from_t35(hdr_plus, bc.buffer, + bytestream2_get_bytes_left(&bc)); + if (res < 0) + return res; + } + + return 0; +} + +static int decode_metadata(AVFrame *frame, const struct aom_image *img) { + const size_t num_metadata = aom_img_num_metadata(img); + for (size_t i = 0; i < num_metadata; ++i) { + const aom_metadata_t *metadata = aom_img_get_metadata(img, i); + if (!metadata) + continue; + + switch (metadata->type) { + case OBU_METADATA_TYPE_ITUT_T35: { + int res = decode_metadata_itu_t_t35(frame, metadata->payload, metadata->sz); + if (res < 0) + return res; + break; + } + default: + break; + } + } + return 0; +} + static int aom_decode(AVCodecContext *avctx, AVFrame *picture, int *got_frame, AVPacket *avpkt) { @@ -215,6 +272,11 @@ static int aom_decode(AVCodecContext *avctx, AVFrame *picture, av_image_copy(picture->data, picture->linesize, planes, stride, avctx->pix_fmt, img->d_w, img->d_h); } + ret = decode_metadata(picture, img); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to decode metadata\n"); + return ret; + } *got_frame = 1; } return avpkt->size; diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 9a384fcc39..4d899559d0 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -33,12 +33,15 @@ #include "libavutil/base64.h" #include "libavutil/common.h" #include "libavutil/cpu.h" +#include "libavutil/hdr_dynamic_metadata.h" #include "libavutil/imgutils.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavcodec/bytestream.h" + #include "av1.h" #include "avcodec.h" #include "bsf.h" @@ -46,6 +49,7 @@ #include "dovi_rpu.h" #include "encode.h" #include "internal.h" +#include "itut35.h" #include "libaom.h" #include "packet_internal.h" #include "profiles.h" @@ -326,6 +330,57 @@ static av_cold int codecctl_int(AVCodecContext *avctx, return 0; } +static int add_hdr_plus(AVCodecContext *avctx, struct aom_image *img, const AVFrame *frame) +{ + // Check for HDR10+ + AVFrameSideData *side_data = + av_frame_get_side_data(frame, AV_FRAME_DATA_DYNAMIC_HDR_PLUS); + if (!side_data) + return 0; + + size_t payload_size; + AVDynamicHDRPlus *hdr_plus = (AVDynamicHDRPlus *)side_data->buf->data; + int res = av_dynamic_hdr_plus_to_t35(hdr_plus, NULL, &payload_size); + if (res < 0) { + log_encoder_error(avctx, "Error finding the size of HDR10+"); + return res; + } + + uint8_t *hdr_plus_buf; + // Extra bytes for the country code, provider code, provider oriented code and app id. + const size_t hdr_plus_buf_size = payload_size + 6; + hdr_plus_buf = av_malloc(hdr_plus_buf_size); + if (!hdr_plus_buf) + return AVERROR(ENOMEM); + + uint8_t *payload = hdr_plus_buf; + bytestream_put_byte(&payload, ITU_T_T35_COUNTRY_CODE_US); + bytestream_put_be16(&payload, ITU_T_T35_PROVIDER_CODE_SMTPE); + bytestream_put_be16(&payload, 0x01); // provider_oriented_code + bytestream_put_byte(&payload, 0x04); // application_identifier + + res = av_dynamic_hdr_plus_to_t35(hdr_plus, &payload, &payload_size); + if (res < 0) { + av_free(hdr_plus_buf); + log_encoder_error(avctx, "Error encoding HDR10+ from side data"); + return res; + } + +#if AOM_IMAGE_ABI_VERSION < 8 + res = aom_img_add_metadata(img, OBU_METADATA_TYPE_ITUT_T35, + hdr_plus_buf, hdr_plus_buf_size); +#else + res = aom_img_add_metadata(img, OBU_METADATA_TYPE_ITUT_T35, + hdr_plus_buf, hdr_plus_buf_size, AOM_MIF_ANY_FRAME); +#endif + av_free(hdr_plus_buf); + if (res < 0) { + log_encoder_error(avctx, "Error adding HDR10+ to aom_img"); + return res; + } + return 0; +} + #if defined(AOM_CTRL_AV1E_GET_NUM_OPERATING_POINTS) && \ defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \ defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX) @@ -1254,6 +1309,7 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, if (frame) { rawimg = &ctx->rawimg; + aom_img_remove_metadata(rawimg); rawimg->planes[AOM_PLANE_Y] = frame->data[0]; rawimg->planes[AOM_PLANE_U] = frame->data[1]; rawimg->planes[AOM_PLANE_V] = frame->data[2]; @@ -1304,6 +1360,10 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, if (frame->pict_type == AV_PICTURE_TYPE_I) flags |= AOM_EFLAG_FORCE_KF; + + res = add_hdr_plus(avctx, rawimg, frame); + if (res < 0) + return res; } res = aom_codec_encode(&ctx->encoder, rawimg, timestamp, duration, flags); diff --git a/libavcodec/version.h b/libavcodec/version.h index eedf4c5a92..cde7d40bc0 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 3 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ -- 2.49.0.1204.g71687c7c1d-goog

4 6

[PATCH 1/2] avutil/intmath: use AV_HAS_BUILTIN to detect builtin availability
by Kacper Michajłow 12 Jun '25

12 Jun '25

Fixes use of bultins on clang x86_64-pc-windows-msvc which does not define any __GNUC__. Also on other targets __GNUC__ is defined to 4 by default, so any feature testing based on version is not really valid. Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> --- libavutil/intmath.h | 12 +++++------- libavutil/x86/intmath.h | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/libavutil/intmath.h b/libavutil/intmath.h index 52e11a8d5f..b177a848c6 100644 --- a/libavutil/intmath.h +++ b/libavutil/intmath.h @@ -35,7 +35,7 @@ #endif #if HAVE_FAST_CLZ -#if AV_GCC_VERSION_AT_LEAST(3,4) +#if AV_GCC_VERSION_AT_LEAST(3,4) || AV_HAS_BUILTIN(__builtin_clz) #ifndef ff_log2 # define ff_log2(x) (31 - __builtin_clz((x)|1)) # ifndef ff_log2_16bit @@ -90,18 +90,16 @@ static av_always_inline av_const int ff_log2_16bit_c(unsigned int v) */ #if HAVE_FAST_CLZ -#if AV_GCC_VERSION_AT_LEAST(3,4) -#ifndef ff_ctz +#if !defined(ff_ctz) && (AV_GCC_VERSION_AT_LEAST(3,4) || AV_HAS_BUILTIN(__builtin_ctz)) #define ff_ctz(v) __builtin_ctz(v) #endif -#ifndef ff_ctzll +#if !defined(ff_ctzll) && (AV_GCC_VERSION_AT_LEAST(3,4) || AV_HAS_BUILTIN(__builtin_ctzll)) #define ff_ctzll(v) __builtin_ctzll(v) #endif -#ifndef ff_clz +#if !defined(ff_clz) && (AV_GCC_VERSION_AT_LEAST(3,4) || AV_HAS_BUILTIN(__builtin_clz)) #define ff_clz(v) __builtin_clz(v) #endif #endif -#endif #ifndef ff_ctz #define ff_ctz ff_ctz_c @@ -154,7 +152,7 @@ static av_always_inline av_const unsigned ff_clz_c(unsigned x) } #endif -#if AV_GCC_VERSION_AT_LEAST(3,4) +#if AV_GCC_VERSION_AT_LEAST(3,4) || AV_HAS_BUILTIN(__builtin_parity) #ifndef av_parity #define av_parity __builtin_parity #endif diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h index 4893a1f1b4..030ded6b6f 100644 --- a/libavutil/x86/intmath.h +++ b/libavutil/x86/intmath.h @@ -66,7 +66,7 @@ static av_always_inline av_const int ff_ctzll_x86(long long v) #endif /* HAVE_FAST_CLZ */ -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) /* Our generic version of av_popcount is faster than GCC's built-in on * CPUs that don't support the popcnt instruction. @@ -81,7 +81,7 @@ static av_always_inline av_const int ff_ctzll_x86(long long v) #if defined(__BMI2__) -#if AV_GCC_VERSION_AT_LEAST(5,1) +#if AV_GCC_VERSION_AT_LEAST(5,1) || AV_HAS_BUILTIN(__builtin_ia32_bzhi_si) #if defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2 #define av_zero_extend av_zero_extend_bmi2 static av_always_inline av_const unsigned av_zero_extend_bmi2(unsigned a, unsigned p) -- 2.45.1

3 8