September 2025 - ffmpeg-cvslog

[ffmpeg] branch master updated. cb5dbb30ca avcodec/tiff_common: Remove unused ff_tadd_*_metadata() funcs
by ffmpeg-git＠ffmpeg.org 25 Sep '25

25 Sep '25

The branch, master has been updated via cb5dbb30caeb9b44897251892350f0e8297b9437 (commit) from 371931250a2b8d9cf2a726d4992f9107af3df782 (commit) - Log ----------------------------------------------------------------- commit cb5dbb30caeb9b44897251892350f0e8297b9437 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Wed Sep 24 05:01:04 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Thu Sep 25 06:47:30 2025 +0200 avcodec/tiff_common: Remove unused ff_tadd_*_metadata() funcs Unused since ad77345a5d14862f4701e5ad422b03b14934a5b9. Reviewed-by: Leo Izen <leo.izen(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/tiff_common.c b/libavcodec/tiff_common.c index ee8061944b..265f843031 100644 --- a/libavcodec/tiff_common.c +++ b/libavcodec/tiff_common.c @@ -97,51 +97,6 @@ static int bprint_to_avdict(AVBPrint *bp, const char *name, return av_dict_set(metadata, name, ap, AV_DICT_DONT_STRDUP_VAL); } -int ff_tadd_rational_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, AVDictionary **metadata) -{ - AVBPrint bp; - int32_t nom, denom; - int i; - - if (count >= INT_MAX / sizeof(int64_t) || count <= 0) - return AVERROR_INVALIDDATA; - if (bytestream2_get_bytes_left(gb) < count * sizeof(int64_t)) - return AVERROR_INVALIDDATA; - - av_bprint_init(&bp, 10 * count, AV_BPRINT_SIZE_UNLIMITED); - - for (i = 0; i < count; i++) { - nom = ff_tget_long(gb, le); - denom = ff_tget_long(gb, le); - av_bprintf(&bp, "%s%7"PRId32":%-7"PRId32, auto_sep(count, sep, i, 4), nom, denom); - } - - return bprint_to_avdict(&bp, name, metadata); -} - - -int ff_tadd_long_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, AVDictionary **metadata) -{ - AVBPrint bp; - int i; - - if (count >= INT_MAX / sizeof(int32_t) || count <= 0) - return AVERROR_INVALIDDATA; - if (bytestream2_get_bytes_left(gb) < count * sizeof(int32_t)) - return AVERROR_INVALIDDATA; - - av_bprint_init(&bp, 10 * count, AV_BPRINT_SIZE_UNLIMITED); - - for (i = 0; i < count; i++) { - av_bprintf(&bp, "%s%7i", auto_sep(count, sep, i, 8), ff_tget_long(gb, le)); - } - - return bprint_to_avdict(&bp, name, metadata); -} - - int ff_tadd_doubles_metadata(int count, const char *name, const char *sep, GetByteContext *gb, int le, AVDictionary **metadata) { @@ -184,28 +139,6 @@ int ff_tadd_shorts_metadata(int count, const char *name, const char *sep, return bprint_to_avdict(&bp, name, metadata); } - -int ff_tadd_bytes_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, int is_signed, AVDictionary **metadata) -{ - AVBPrint bp; - int i; - - if (count >= INT_MAX / sizeof(int8_t) || count < 0) - return AVERROR_INVALIDDATA; - if (bytestream2_get_bytes_left(gb) < count * sizeof(int8_t)) - return AVERROR_INVALIDDATA; - - av_bprint_init(&bp, 10 * count, AV_BPRINT_SIZE_UNLIMITED); - - for (i = 0; i < count; i++) { - int v = is_signed ? (int8_t)bytestream2_get_byte(gb) : bytestream2_get_byte(gb); - av_bprintf(&bp, "%s%3i", auto_sep(count, sep, i, 16), v); - } - - return bprint_to_avdict(&bp, name, metadata); -} - int ff_tadd_string_metadata(int count, const char *name, GetByteContext *gb, int le, AVDictionary **metadata) { diff --git a/libavcodec/tiff_common.h b/libavcodec/tiff_common.h index 11f2e739a4..67f23bd4fa 100644 --- a/libavcodec/tiff_common.h +++ b/libavcodec/tiff_common.h @@ -62,18 +62,6 @@ double ff_tget_double(GetByteContext *gb, int le); /** Reads a byte from the bytestream using given endianness. */ unsigned ff_tget(GetByteContext *gb, int type, int le); -/** Adds count rationals converted to a string - * into the metadata dictionary. - */ -int ff_tadd_rational_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, AVDictionary **metadata); - -/** Adds count longs converted to a string - * into the metadata dictionary. - */ -int ff_tadd_long_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, AVDictionary **metadata); - /** Adds count doubles converted to a string * into the metadata dictionary. */ @@ -86,12 +74,6 @@ int ff_tadd_doubles_metadata(int count, const char *name, const char *sep, int ff_tadd_shorts_metadata(int count, const char *name, const char *sep, GetByteContext *gb, int le, int is_signed, AVDictionary **metadata); -/** Adds count bytes converted to a string - * into the metadata dictionary. - */ -int ff_tadd_bytes_metadata(int count, const char *name, const char *sep, - GetByteContext *gb, int le, int is_signed, AVDictionary **metadata); - /** Adds a string of count characters * into the metadata dictionary. */ ----------------------------------------------------------------------- Summary of changes: libavcodec/tiff_common.c | 67 ------------------------------------------------ libavcodec/tiff_common.h | 18 ------------- 2 files changed, 85 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 371931250a avcodec/ohdec: Check mutex/conditions initialization
by ffmpeg-git＠ffmpeg.org 25 Sep '25

25 Sep '25

The branch, master has been updated via 371931250a2b8d9cf2a726d4992f9107af3df782 (commit) via 748fa0a9bbd807cb6b3b7964f3793caf68bb5ed0 (commit) via 320133aafc4103e1f8c85a2589d1818af9507b06 (commit) from 5cb6d2221a6d4c07453b6c301ecfcaed48402680 (commit) - Log ----------------------------------------------------------------- commit 371931250a2b8d9cf2a726d4992f9107af3df782 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Tue Sep 23 16:05:30 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Thu Sep 25 05:29:58 2025 +0200 avcodec/ohdec: Check mutex/conditions initialization Reviewed-by: Zhao Zhili <quinkblack(a)foxmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/ohdec.c b/libavcodec/ohdec.c index 86f3c84279..943b027681 100644 --- a/libavcodec/ohdec.c +++ b/libavcodec/ohdec.c @@ -37,6 +37,7 @@ #include "decode.h" #include "hwconfig.h" #include "ohcodec.h" +#include "pthread_internal.h" typedef struct OHCodecDecContext { AVClass *avclass; @@ -70,8 +71,14 @@ typedef struct OHCodecDecContext { char *name; int allow_sw; + unsigned mutex_cond_cnt; } OHCodecDecContext; +#define OFFSET(x) offsetof(OHCodecDecContext, x) +DEFINE_OFFSET_ARRAY(OHCodecDecContext, mutex_cond, mutex_cond_cnt, + (OFFSET(input_mutex), OFFSET(output_mutex)), + (OFFSET(input_cond), OFFSET(output_cond))); + typedef struct OHCodecBuffer { uint32_t index; OH_AVBuffer *buffer; @@ -367,12 +374,11 @@ static av_cold int oh_decode_init(AVCodecContext *avctx) OHCodecDecContext *s = avctx->priv_data; // Initialize these fields first, so oh_decode_close can destroy them safely - ff_mutex_init(&s->input_mutex, NULL); - ff_cond_init(&s->input_cond, NULL); - ff_mutex_init(&s->output_mutex, NULL); - ff_cond_init(&s->output_cond, NULL); + int ret = ff_pthread_init(s, mutex_cond_offsets); + if (ret < 0) + return ret; - int ret = oh_decode_create(s, avctx); + ret = oh_decode_create(s, avctx); if (ret < 0) return ret; ret = oh_decode_set_format(s, avctx); @@ -414,14 +420,12 @@ static av_cold int oh_decode_close(AVCodecContext *avctx) av_packet_unref(&s->pkt); - ff_mutex_destroy(&s->input_mutex); - ff_cond_destroy(&s->input_cond); av_fifo_freep2(&s->input_queue); - ff_mutex_destroy(&s->output_mutex); - ff_cond_destroy(&s->output_cond); av_fifo_freep2(&s->output_queue); + ff_pthread_free(s, mutex_cond_offsets); + return 0; } @@ -718,7 +722,6 @@ static const AVCodecHWConfigInternal *const oh_hw_configs[] = { NULL }; -#define OFFSET(x) offsetof(OHCodecDecContext, x) #define VD (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM) static const AVOption ohcodec_vdec_options[] = { {"codec_name", "Select codec by name", commit 748fa0a9bbd807cb6b3b7964f3793caf68bb5ed0 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Tue Sep 23 15:52:09 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Thu Sep 25 05:29:26 2025 +0200 avcodec/ohdec: Switch to RefStruct API for internal refcounting It avoids allocations and corresponding error conditions. Reviewed-by: Zhao Zhili <quinkblack(a)foxmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/ohdec.c b/libavcodec/ohdec.c index 08b03a7e7b..86f3c84279 100644 --- a/libavcodec/ohdec.c +++ b/libavcodec/ohdec.c @@ -29,6 +29,7 @@ #include "libavutil/imgutils.h" #include "libavutil/mem.h" #include "libavutil/opt.h" +#include "libavutil/refstruct.h" #include "libavutil/thread.h" #include "avcodec.h" @@ -40,11 +41,11 @@ typedef struct OHCodecDecContext { AVClass *avclass; OH_AVCodec *dec; - /* A reference count to dec. Each hardware frame has a reference count to + /* A RefStruct reference backing dec. Each hardware frame has a reference count to * dec. dec will be destroyed only after oh_decode_close and all hardware * frames have been released. */ - AVBufferRef *dec_ref; + OH_AVCodec **dec_ref; AVMutex input_mutex; AVCond input_cond; @@ -74,13 +75,13 @@ typedef struct OHCodecDecContext { typedef struct OHCodecBuffer { uint32_t index; OH_AVBuffer *buffer; - AVBufferRef *dec_ref; + OH_AVCodec **dec_ref; ///< RefStruct reference } OHCodecBuffer; -static void oh_decode_release(void *opaque, uint8_t *data) +static void oh_decode_release(AVRefStructOpaque unused, void *obj) { - OH_AVCodec *dec = (OH_AVCodec *)data; - OH_AVErrCode err = OH_VideoDecoder_Destroy(dec); + OH_AVCodec **decp = obj; + OH_AVErrCode err = OH_VideoDecoder_Destroy(*decp); if (err == AV_ERR_OK) av_log(NULL, AV_LOG_DEBUG, "Destroy decoder success\n"); else @@ -122,13 +123,13 @@ static int oh_decode_create(OHCodecDecContext *s, AVCodecContext *avctx) } av_log(avctx, AV_LOG_DEBUG, "Create decoder %s success\n", name); - s->dec_ref = av_buffer_create((uint8_t *)s->dec, 0, oh_decode_release, - NULL, 0); + s->dec_ref = av_refstruct_alloc_ext(sizeof(*s->dec_ref), 0, NULL, oh_decode_release); if (!s->dec_ref) { - oh_decode_release(NULL, (uint8_t*)s->dec); + oh_decode_release((AVRefStructOpaque){.nc = NULL }, &s->dec); s->dec = NULL; return AVERROR(ENOMEM); } + *s->dec_ref = s->dec; return 0; } @@ -408,7 +409,7 @@ static av_cold int oh_decode_close(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Stop decoder failed, %d, %s\n", err, av_err2str(ff_oh_err_to_ff_err(err))); s->dec = NULL; - av_buffer_unref(&s->dec_ref); + av_refstruct_unref(&s->dec_ref); } av_packet_unref(&s->pkt); @@ -431,13 +432,8 @@ static void oh_buffer_release(void *opaque, uint8_t *data) OHCodecBuffer *buffer = opaque; - if (!buffer->dec_ref) { - av_free(buffer); - return; - } - if (buffer->buffer) { - OH_AVCodec *dec = (OH_AVCodec *)buffer->dec_ref->data; + OH_AVCodec *dec = *buffer->dec_ref; OH_AVCodecBufferAttr attr; OH_AVErrCode err = OH_AVBuffer_GetBufferAttr(buffer->buffer, &attr); if (err == AV_ERR_OK && !(attr.flags & AVCODEC_BUFFER_FLAGS_DISCARD)) @@ -446,7 +442,7 @@ static void oh_buffer_release(void *opaque, uint8_t *data) OH_VideoDecoder_FreeOutputBuffer(dec, buffer->index); } - av_buffer_unref(&buffer->dec_ref); + av_refstruct_unref(&buffer->dec_ref); av_free(buffer); } @@ -467,11 +463,7 @@ static int oh_decode_wrap_hw_buffer(AVCodecContext *avctx, AVFrame *frame, if (!buffer) return AVERROR(ENOMEM); - buffer->dec_ref = av_buffer_ref(s->dec_ref); - if (!buffer->dec_ref) { - oh_buffer_release(buffer, NULL); - return AVERROR(ENOMEM); - } + buffer->dec_ref = av_refstruct_ref(s->dec_ref); buffer->index = output->index; buffer->buffer = output->buffer; commit 320133aafc4103e1f8c85a2589d1818af9507b06 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Tue Sep 23 15:03:40 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Thu Sep 25 05:28:16 2025 +0200 avcodec/ohdec: Release decoder on allocation failure Normally, the OH_AVCodec is wrapped inside an AVBuffer to be freed in its free callback; yet when creating the AVBuffer fails, the decoder is never destroyed. Reviewed-by: Zhao Zhili <quinkblack(a)foxmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/ohdec.c b/libavcodec/ohdec.c index cf1177afcd..08b03a7e7b 100644 --- a/libavcodec/ohdec.c +++ b/libavcodec/ohdec.c @@ -124,8 +124,11 @@ static int oh_decode_create(OHCodecDecContext *s, AVCodecContext *avctx) s->dec_ref = av_buffer_create((uint8_t *)s->dec, 0, oh_decode_release, NULL, 0); - if (!s->dec_ref) + if (!s->dec_ref) { + oh_decode_release(NULL, (uint8_t*)s->dec); + s->dec = NULL; return AVERROR(ENOMEM); + } return 0; } ----------------------------------------------------------------------- Summary of changes: libavcodec/ohdec.c | 62 ++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch release/7.1 updated. 8320e6b415 libavutil/arm: Rename the HWCAP defines
by ffmpeg-git＠ffmpeg.org 25 Sep '25

25 Sep '25

The branch, release/7.1 has been updated via 8320e6b4155d4488e3ed2665a05d2b2f389fa20d (commit) via a337e8f86a9c2c9740da6a9960a5cb855c109c6b (commit) from ab0545969279dc832d431500be11f61e3dadcf91 (commit) - Log ----------------------------------------------------------------- commit 8320e6b4155d4488e3ed2665a05d2b2f389fa20d Author: Brad Smith <brad(a)comstyle.com> AuthorDate: Mon Sep 22 07:28:21 2025 -0400 Commit: Brad Smith <brad(a)comstyle.com> CommitDate: Wed Sep 24 19:59:47 2025 -0400 libavutil/arm: Rename the HWCAP defines Rename the HWCAP defines to use the same naming scheme as AArch64 and PPC. (cherry picked from commit ced4a6ebc9e7cd92d0ca9b9fb8f9d1013d23cbfa) Signed-off-by: Brad Smith <brad(a)comstyle.com> diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c index 8ec28143d7..2e2977efc9 100644 --- a/libavutil/arm/cpu.c +++ b/libavutil/arm/cpu.c @@ -47,12 +47,12 @@ #endif /* Relevant HWCAP values from kernel headers */ -#define HWCAP_VFP (1 << 6) -#define HWCAP_EDSP (1 << 7) -#define HWCAP_THUMBEE (1 << 11) -#define HWCAP_NEON (1 << 12) -#define HWCAP_VFPv3 (1 << 13) -#define HWCAP_TLS (1 << 15) +#define HWCAP_ARM_VFP (1 << 6) +#define HWCAP_ARM_EDSP (1 << 7) +#define HWCAP_ARM_THUMBEE (1 << 11) +#define HWCAP_ARM_NEON (1 << 12) +#define HWCAP_ARM_VFPv3 (1 << 13) +#define HWCAP_ARM_TLS (1 << 15) static int get_auxval(uint32_t *hwcap) { @@ -101,19 +101,19 @@ static int get_cpuinfo(uint32_t *hwcap) while (fgets(buf, sizeof(buf), f)) { if (av_strstart(buf, "Features", NULL)) { if (strstr(buf, " edsp ")) - *hwcap |= HWCAP_EDSP; + *hwcap |= HWCAP_ARM_EDSP; if (strstr(buf, " tls ")) - *hwcap |= HWCAP_TLS; + *hwcap |= HWCAP_ARM_TLS; if (strstr(buf, " thumbee ")) - *hwcap |= HWCAP_THUMBEE; + *hwcap |= HWCAP_ARM_THUMBEE; if (strstr(buf, " vfp ")) - *hwcap |= HWCAP_VFP; + *hwcap |= HWCAP_ARM_VFP; if (strstr(buf, " vfpv3 ")) - *hwcap |= HWCAP_VFPv3; + *hwcap |= HWCAP_ARM_VFPv3; if (strstr(buf, " neon ") || strstr(buf, " asimd ")) - *hwcap |= HWCAP_NEON; + *hwcap |= HWCAP_ARM_NEON; if (strstr(buf, " fp ")) // Listed on 64 bit ARMv8 kernels - *hwcap |= HWCAP_VFP | HWCAP_VFPv3; + *hwcap |= HWCAP_ARM_VFP | HWCAP_ARM_VFPv3; break; } } @@ -135,7 +135,7 @@ int ff_get_cpu_flags_arm(void) return flags; #define check_cap(cap, flag) do { \ - if (hwcap & HWCAP_ ## cap) \ + if (hwcap & HWCAP_ARM_ ## cap) \ flags |= AV_CPU_FLAG_ ## flag; \ } while (0) commit a337e8f86a9c2c9740da6a9960a5cb855c109c6b Author: Brad Smith <brad(a)comstyle.com> AuthorDate: Sat Sep 20 23:06:08 2025 -0400 Commit: Brad Smith <brad(a)comstyle.com> CommitDate: Wed Sep 24 19:58:39 2025 -0400 libavutil/arm: Make use of elf_aux_info() on FreeBSD/OpenBSD - FreBSD/OpenBSD have elf_aux_info() on arm - Wrap AT_HWCAP as the value is different for BSD vs Linux (16 vs 25) (cherry picked from commit cdae5c3639f4adcd289e643a203d43d4e01d87f5) Signed-off-by: Brad Smith <brad(a)comstyle.com> diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c index b84882005a..8ec28143d7 100644 --- a/libavutil/arm/cpu.c +++ b/libavutil/arm/cpu.c @@ -31,18 +31,20 @@ CORE_FLAG(VFPV3) | \ CORE_FLAG(NEON)) -#if defined __linux__ || defined __ANDROID__ +#if defined __linux__ || defined __ANDROID__ || HAVE_ELF_AUX_INFO #include <stdint.h> #include <stdio.h> #include <string.h> #include "libavutil/avstring.h" -#if HAVE_GETAUXVAL +#if HAVE_GETAUXVAL || HAVE_ELF_AUX_INFO #include <sys/auxv.h> #endif +#ifndef AT_HWCAP #define AT_HWCAP 16 +#endif /* Relevant HWCAP values from kernel headers */ #define HWCAP_VFP (1 << 6) @@ -54,7 +56,7 @@ static int get_auxval(uint32_t *hwcap) { -#if HAVE_GETAUXVAL +#if HAVE_GETAUXVAL || HAVE_ELF_AUX_INFO unsigned long ret = ff_getauxval(AT_HWCAP); if (ret == 0) return -1; @@ -65,6 +67,7 @@ static int get_auxval(uint32_t *hwcap) #endif } +#if defined __linux__ || defined __ANDROID__ static int get_hwcap(uint32_t *hwcap) { struct { uint32_t a_type; uint32_t a_val; } auxv; @@ -117,6 +120,7 @@ static int get_cpuinfo(uint32_t *hwcap) fclose(f); return 0; } +#endif int ff_get_cpu_flags_arm(void) { @@ -124,8 +128,10 @@ int ff_get_cpu_flags_arm(void) uint32_t hwcap; if (get_auxval(&hwcap) < 0) +#if defined __linux__ || defined __ANDROID__ if (get_hwcap(&hwcap) < 0) if (get_cpuinfo(&hwcap) < 0) +#endif return flags; #define check_cap(cap, flag) do { \ ----------------------------------------------------------------------- Summary of changes: libavutil/arm/cpu.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch release/8.0 updated. d8605a6b55 libavutil/arm: Rename the HWCAP defines
by ffmpeg-git＠ffmpeg.org 24 Sep '25

24 Sep '25

The branch, release/8.0 has been updated via d8605a6b5549887edcca69c1ba0400fe14e0de3d (commit) via c9b8e5999b5aae485917ecf7ec90b01ccbdd747d (commit) from b9adbf0fcc26e04a0f291c9f8857affb4540a6e3 (commit) - Log ----------------------------------------------------------------- commit d8605a6b5549887edcca69c1ba0400fe14e0de3d Author: Brad Smith <brad(a)comstyle.com> AuthorDate: Mon Sep 22 07:28:21 2025 -0400 Commit: Brad Smith <brad(a)comstyle.com> CommitDate: Wed Sep 24 19:55:16 2025 -0400 libavutil/arm: Rename the HWCAP defines Rename the HWCAP defines to use the same naming scheme as AArch64 and PPC. (cherry picked from commit ced4a6ebc9e7cd92d0ca9b9fb8f9d1013d23cbfa) Signed-off-by: Brad Smith <brad(a)comstyle.com> diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c index 8ec28143d7..2e2977efc9 100644 --- a/libavutil/arm/cpu.c +++ b/libavutil/arm/cpu.c @@ -47,12 +47,12 @@ #endif /* Relevant HWCAP values from kernel headers */ -#define HWCAP_VFP (1 << 6) -#define HWCAP_EDSP (1 << 7) -#define HWCAP_THUMBEE (1 << 11) -#define HWCAP_NEON (1 << 12) -#define HWCAP_VFPv3 (1 << 13) -#define HWCAP_TLS (1 << 15) +#define HWCAP_ARM_VFP (1 << 6) +#define HWCAP_ARM_EDSP (1 << 7) +#define HWCAP_ARM_THUMBEE (1 << 11) +#define HWCAP_ARM_NEON (1 << 12) +#define HWCAP_ARM_VFPv3 (1 << 13) +#define HWCAP_ARM_TLS (1 << 15) static int get_auxval(uint32_t *hwcap) { @@ -101,19 +101,19 @@ static int get_cpuinfo(uint32_t *hwcap) while (fgets(buf, sizeof(buf), f)) { if (av_strstart(buf, "Features", NULL)) { if (strstr(buf, " edsp ")) - *hwcap |= HWCAP_EDSP; + *hwcap |= HWCAP_ARM_EDSP; if (strstr(buf, " tls ")) - *hwcap |= HWCAP_TLS; + *hwcap |= HWCAP_ARM_TLS; if (strstr(buf, " thumbee ")) - *hwcap |= HWCAP_THUMBEE; + *hwcap |= HWCAP_ARM_THUMBEE; if (strstr(buf, " vfp ")) - *hwcap |= HWCAP_VFP; + *hwcap |= HWCAP_ARM_VFP; if (strstr(buf, " vfpv3 ")) - *hwcap |= HWCAP_VFPv3; + *hwcap |= HWCAP_ARM_VFPv3; if (strstr(buf, " neon ") || strstr(buf, " asimd ")) - *hwcap |= HWCAP_NEON; + *hwcap |= HWCAP_ARM_NEON; if (strstr(buf, " fp ")) // Listed on 64 bit ARMv8 kernels - *hwcap |= HWCAP_VFP | HWCAP_VFPv3; + *hwcap |= HWCAP_ARM_VFP | HWCAP_ARM_VFPv3; break; } } @@ -135,7 +135,7 @@ int ff_get_cpu_flags_arm(void) return flags; #define check_cap(cap, flag) do { \ - if (hwcap & HWCAP_ ## cap) \ + if (hwcap & HWCAP_ARM_ ## cap) \ flags |= AV_CPU_FLAG_ ## flag; \ } while (0) commit c9b8e5999b5aae485917ecf7ec90b01ccbdd747d Author: Brad Smith <brad(a)comstyle.com> AuthorDate: Sat Sep 20 23:06:08 2025 -0400 Commit: Brad Smith <brad(a)comstyle.com> CommitDate: Wed Sep 24 19:53:04 2025 -0400 libavutil/arm: Make use of elf_aux_info() on FreeBSD/OpenBSD - FreBSD/OpenBSD have elf_aux_info() on arm - Wrap AT_HWCAP as the value is different for BSD vs Linux (16 vs 25) (cherry picked from commit cdae5c3639f4adcd289e643a203d43d4e01d87f5) Signed-off-by: Brad Smith <brad(a)comstyle.com> diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c index b84882005a..8ec28143d7 100644 --- a/libavutil/arm/cpu.c +++ b/libavutil/arm/cpu.c @@ -31,18 +31,20 @@ CORE_FLAG(VFPV3) | \ CORE_FLAG(NEON)) -#if defined __linux__ || defined __ANDROID__ +#if defined __linux__ || defined __ANDROID__ || HAVE_ELF_AUX_INFO #include <stdint.h> #include <stdio.h> #include <string.h> #include "libavutil/avstring.h" -#if HAVE_GETAUXVAL +#if HAVE_GETAUXVAL || HAVE_ELF_AUX_INFO #include <sys/auxv.h> #endif +#ifndef AT_HWCAP #define AT_HWCAP 16 +#endif /* Relevant HWCAP values from kernel headers */ #define HWCAP_VFP (1 << 6) @@ -54,7 +56,7 @@ static int get_auxval(uint32_t *hwcap) { -#if HAVE_GETAUXVAL +#if HAVE_GETAUXVAL || HAVE_ELF_AUX_INFO unsigned long ret = ff_getauxval(AT_HWCAP); if (ret == 0) return -1; @@ -65,6 +67,7 @@ static int get_auxval(uint32_t *hwcap) #endif } +#if defined __linux__ || defined __ANDROID__ static int get_hwcap(uint32_t *hwcap) { struct { uint32_t a_type; uint32_t a_val; } auxv; @@ -117,6 +120,7 @@ static int get_cpuinfo(uint32_t *hwcap) fclose(f); return 0; } +#endif int ff_get_cpu_flags_arm(void) { @@ -124,8 +128,10 @@ int ff_get_cpu_flags_arm(void) uint32_t hwcap; if (get_auxval(&hwcap) < 0) +#if defined __linux__ || defined __ANDROID__ if (get_hwcap(&hwcap) < 0) if (get_cpuinfo(&hwcap) < 0) +#endif return flags; #define check_cap(cap, flag) do { \ ----------------------------------------------------------------------- Summary of changes: libavutil/arm/cpu.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) hooks/post-receive --

1 0

[ffmpeg-web] branch master updated. 98c5740 web/security: add more CVEs
by ffmpeg-git＠ffmpeg.org 24 Sep '25

24 Sep '25

The branch, master has been updated via 98c5740f14cfe8c2b7fdfe81d691e2aa0b13a4c0 (commit) from 39d4e357c4389c69bb22193d080dd29b998d2a9e (commit) - Log ----------------------------------------------------------------- commit 98c5740f14cfe8c2b7fdfe81d691e2aa0b13a4c0 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Sep 24 20:05:14 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Wed Sep 24 20:05:14 2025 +0200 web/security: add more CVEs diff --git a/src/security b/src/security index f98b7c9..ea64661 100644 --- a/src/security +++ b/src/security @@ -5,6 +5,9 @@ Fixes following vulnerabilities: </p> <pre> +CVE-2025-59733, 0469d68acb52081ca8385b844b9650398242be0f, BIGSLEEP-436511754 +CVE-2025-59734, d311382c38df9c2237b33a9e8e860a5da7d2895d, BIGSLEEP-440183164 +CVE-2025-59734, c41a70b6bb79707e1e3a4b0e31950cd986b9f50e, BIGSLEEP-440183164 </pre> @@ -25,6 +28,14 @@ CVE-2025-1816, 0526535cd58444dd264e810b2f3348b4d96cff3b, ticket/11475, CVE-2025-22919, 1446e37d3d032e1452844778b3e6ba2c20f0c322, ticket/11385, CVE-2025-22920, 4bf784c0e5615c3f934e677d5de093a8be7da7ae, ticket/11389 never affected a release CVE-2025-25471, fd1772b7475d0d5673a5dd314ee78443d0be4cf1, ticket/11417 never affected a release +CVE-2025-59728, ce0a655f85c1144d19a4acad59afbb92e4997e30, BIGSLEEP-433502298 +CVE-2025-59729, 33ae6cda71e6d34c9081a612abae00e2c7d39f72, BIGSLEEP-433513232 +CVE-2025-59730, 3ccd7d8c8e85aaae0c6d6cc88ea6cb5309d56cdc, BIGSLEEP-434637586 +CVE-2025-59731, 0d9c003d76383e82b57b6d5aa33776709d0cda2c, BIGSLEEP-436510153 +CVE-2025-59732, f45da79b2c336c5f8f3e563d72b8a22fecdcde0c, BIGSLEEP-436510316 +CVE-2025-59733, de76fb27a6e6da0431154ce9093933281a38a889 / 0469d68acb52081ca8385b844b9650398242be0f, BIGSLEEP-436511754 +CVE-2025-59734, af310e68db0791b94753a9670c9a9ef0d717e32a / d311382c38df9c2237b33a9e8e860a5da7d2895d, BIGSLEEP-440183164 +CVE-2025-59734, c3747e011e7c7107ad6ef4c9e0a1c26490e2c30f / c41a70b6bb79707e1e3a4b0e31950cd986b9f50e, BIGSLEEP-440183164 </pre> @@ -36,6 +47,10 @@ Fixes following vulnerabilities: </p> <pre> CVE-2025-1594, c2184b65d214d60f2d3df86a11ca502567a3d134, ticket/11418 +CVE-2025-59728, 342ea86330ae388baf686fa220892833d55a1c3f / ce0a655f85c1144d19a4acad59afbb92e4997e30, BIGSLEEP-433502298, +CVE-2025-59731, d7e188f33f638d85a1ab70943bde70359454b05c / 0d9c003d76383e82b57b6d5aa33776709d0cda2c, BIGSLEEP-436510153, +CVE-2025-59732, 97932677dbc29c1173f3361886022426ac74197e / f45da79b2c336c5f8f3e563d72b8a22fecdcde0c, BIGSLEEP-436510316, +CVE-2025-59733, a9ec8317498b62192cc3df95ef2523eae8ec0294 / 0469d68acb52081ca8385b844b9650398242be0f, BIGSLEEP-436511754, </pre> <h3>7.1.1</h3> @@ -68,7 +83,15 @@ CVE-2024-35368, 4513300989502090c4fd6560544dce399a8cd53c (specific to builds wit Fixes following vulnerabilities: </p> <pre> +CVE-2023-6602, 8e95a9177eb95c260b16e154c71c35767a14ed10 / 91d96dc8ddaebe0b6cb393f672085e6bfaf15a31 +CVE-2023-6604, 8e95a9177eb95c260b16e154c71c35767a14ed10 / 91d96dc8ddaebe0b6cb393f672085e6bfaf15a31 +CVE-2023-6605, 7dd232e5876f5144a53389aa744c2614a5a3151d / 4c96d6bf75357ab13808efc9f08c1b41b1bf5bdf +CVE-2024-35368, 26737680d3f3f5b27cd0c0a7049d8330a2746172 / 4513300989502090c4fd6560544dce399a8cd53c +CVE-2025-0518, 1e3b60a916c3d6f7e1e0642f8bd50639c14a07c8 / b5b6391d64807578ab872dc58fb8aa621dcfc38a CVE-2025-1594, f98f142da571653436596ccad2d09c7e39bfd4fb, ticket/11418 +CVE-2025-1816, 695dcf29c21911db19cc41722af94ece131303d8 / 0526535cd58444dd264e810b2f3348b4d96cff3b, ticket/11475, +CVE-2025-22919, ab650a52845bd8df25fbd4710b2c25c676461438 / 1446e37d3d032e1452844778b3e6ba2c20f0c322, ticket/11385 +CVE-2025-59728, cc6371d48d10f90571b40eb9680ce7198c4b4532 / ce0a655f85c1144d19a4acad59afbb92e4997e30, BIGSLEEP-433502298 </pre> <h3>7.0.2</h3> @@ -116,6 +139,10 @@ CVE-2024-35367, bed04417b4d38af7a1b477b24ea6e26547e32373 / 09e6840cf7a3ee07a73c3 CVE-2024-35368, b43a12363c1fef0efa7eac15b6b830417656db15 / 4513300989502090c4fd6560544dce399a8cd53c CVE-2025-0518, 43f64690ad9df72976bcbd6ea9e41b2542db2464 / b5b6391d64807578ab872dc58fb8aa621dcfc38a CVE-2025-22919, e2b20632b8c71a4e174511f8ff6e8342e0c63bd3 / 1446e37d3d032e1452844778b3e6ba2c20f0c322, ticket/11385 +CVE-2025-59728, 01c3093510a5b69d3c7ac3a976eb6a58c2510cfd / ce0a655f85c1144d19a4acad59afbb92e4997e30, BIGSLEEP-433502298 +CVE-2025-59731, be682029ae18b80fa9b27f0715ca77323409379c / 0d9c003d76383e82b57b6d5aa33776709d0cda2c, BIGSLEEP-436510153 +CVE-2025-59732, fa543b33f63478090137d124c20ff97f76251254 / f45da79b2c336c5f8f3e563d72b8a22fecdcde0c, BIGSLEEP-436510316 +CVE-2025-59733, a2e8dc01c0a50d2ec8c85d836bda8eaef6891e50 / 0469d68acb52081ca8385b844b9650398242be0f, BIGSLEEP-436511754 </pre> <h3>6.1.2</h3> @@ -179,6 +206,10 @@ CVE-2024-35367, 1a874e645d4a0adef9b494482fc67d12d35395cd / 09e6840cf7a3ee07a73c3 CVE-2024-35368, d45964ac04a83f02cb6ddc63af6d0b646c7d9082 / 4513300989502090c4fd6560544dce399a8cd53c CVE-2025-0518, edfcade702b41de4417e2597ba2aff6ecbdead0e / b5b6391d64807578ab872dc58fb8aa621dcfc38a CVE-2025-22919, a01eaecf6325cefab5b26e0d905df6662db37be1 / 1446e37d3d032e1452844778b3e6ba2c20f0c322, ticket/11385 +CVE-2025-59728, 6e9758a4e7f983d67a63218021c5b9002264355e / ce0a655f85c1144d19a4acad59afbb92e4997e30, BIGSLEEP-433502298 +CVE-2025-59731, ec959281897aa29076f3083edbc2306357342d7c / 0d9c003d76383e82b57b6d5aa33776709d0cda2c, BIGSLEEP-436510153 +CVE-2025-59732, 20708b957e8d4d57801c0b7ac52131988b093a49 / f45da79b2c336c5f8f3e563d72b8a22fecdcde0c, BIGSLEEP-436510316 +CVE-2025-59733, 1080d0e3cded6d8e177c2ce8b6649bc238be2ff6 / 0469d68acb52081ca8385b844b9650398242be0f, BIGSLEEP-436511754 </pre> <h3>5.1.6</h3> ----------------------------------------------------------------------- Summary of changes: src/security | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 5cb6d2221a avformat/http: Handle IPv6 Zone ID in hostname
by ffmpeg-git＠ffmpeg.org 24 Sep '25

24 Sep '25

The branch, master has been updated via 5cb6d2221a6d4c07453b6c301ecfcaed48402680 (commit) from 56c14f231159d9a0dfa0a46661886c9baad870a6 (commit) - Log ----------------------------------------------------------------- commit 5cb6d2221a6d4c07453b6c301ecfcaed48402680 Author: Marvin Scholz <epirat07(a)gmail.com> AuthorDate: Thu May 22 20:14:49 2025 +0200 Commit: Marvin Scholz <epirat07(a)gmail.com> CommitDate: Wed Sep 24 12:03:13 2025 +0000 avformat/http: Handle IPv6 Zone ID in hostname When using a literal IPv6 address as hostname, it can contain a Zone ID especially in the case of link-local addresses. Sending this to the server in the Host header is not useful to the server and in some cases servers refuse such requests. To prevent any such issues, strip the Zone ID from the address if it's an IPv6 address. This also removes it for the Cookies lookup. Based on a patch by: Daniel N Pettersson <danielnp(a)axis.com> diff --git a/libavformat/http.c b/libavformat/http.c index 0d4077512b..49d750b512 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -24,6 +24,7 @@ #include "config.h" #include "config_components.h" +#include <string.h> #include <time.h> #if CONFIG_ZLIB #include <zlib.h> @@ -214,7 +215,7 @@ static int http_open_cnx_internal(URLContext *h, AVDictionary **options) const char *path, *proxy_path, *lower_proto = "tcp", *local_path; char *env_http_proxy, *env_no_proxy; char *hashmark; - char hostname[1024], hoststr[1024], proto[10]; + char hostname[1024], hoststr[1024], proto[10], tmp_host[1024]; char auth[1024], proxyauth[1024] = ""; char path1[MAX_URL_SIZE], sanitized_path[MAX_URL_SIZE + 1]; char buf[1024], urlbuf[MAX_URL_SIZE]; @@ -224,7 +225,14 @@ static int http_open_cnx_internal(URLContext *h, AVDictionary **options) av_url_split(proto, sizeof(proto), auth, sizeof(auth), hostname, sizeof(hostname), &port, path1, sizeof(path1), s->location); - ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL); + + av_strlcpy(tmp_host, hostname, sizeof(tmp_host)); + // In case of an IPv6 address, we need to strip the Zone ID, + // if any. We do it at the first % sign, as percent encoding + // can be used in the Zone ID itself. + if (strchr(tmp_host, ':')) + tmp_host[strcspn(tmp_host, "%")] = '\0'; + ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, tmp_host, port, NULL); env_http_proxy = getenv_utf8("http_proxy"); proxy_path = s->http_proxy ? s->http_proxy : env_http_proxy; ----------------------------------------------------------------------- Summary of changes: libavformat/http.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 56c14f2311 avcodec/libmpeghdec: add MPEG-H 3DA Fraunhofer IIS mpeghdec decoder
by ffmpeg-git＠ffmpeg.org 24 Sep '25

24 Sep '25

The branch, master has been updated via 56c14f231159d9a0dfa0a46661886c9baad870a6 (commit) from e5f82ab8686b3c6193a3f718f53dbef9436b4318 (commit) - Log ----------------------------------------------------------------- commit 56c14f231159d9a0dfa0a46661886c9baad870a6 Author: Stadelmann, Daniel <daniel.stadelmann(a)iis.fraunhofer.de> AuthorDate: Fri Aug 1 07:15:37 2025 +0200 Commit: Stadelmann, Daniel <daniel.stadelmann(a)iis.fraunhofer.de> CommitDate: Wed Sep 24 08:25:42 2025 +0200 avcodec/libmpeghdec: add MPEG-H 3DA Fraunhofer IIS mpeghdec decoder Adds a wrapper around the Fraunhofer IIS MPEG-H 3D Audio mpeghdec [1] decoder shared library. [1] https://github.com/Fraunhofer-IIS/mpeghdec Signed-off-by: Stadelmann, Daniel <daniel.stadelmann(a)iis.fraunhofer.de> diff --git a/Changelog b/Changelog index 997ff3b0b6..6fd95c9136 100644 --- a/Changelog +++ b/Changelog @@ -6,6 +6,7 @@ version <next>: - EXIF Metadata Parsing - gfxcapture: Windows.Graphics.Capture based window/monitor capture - hxvs demuxer for HXVS/HXVT IP camera format +- MPEG-H 3D Audio decoding via mpeghdec version 8.0: diff --git a/configure b/configure index e5764a17a3..c4e16ff97e 100755 --- a/configure +++ b/configure @@ -250,6 +250,7 @@ External library support: --enable-liblensfun enable lensfun lens correction [no] --enable-libmodplug enable ModPlug via libmodplug [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no] + --enable-libmpeghdec enable MPEG-H 3DA decoding via libmpeghdec [no] --enable-liboapv enable APV encoding via liboapv [no] --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no] --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no] @@ -1926,6 +1927,7 @@ EXTERNAL_LIBRARY_GPL_LIST=" EXTERNAL_LIBRARY_NONFREE_LIST=" decklink libfdk_aac + libmpeghdec libtls " @@ -3673,6 +3675,7 @@ liblc3_encoder_select="audio_frame_queue" libmodplug_demuxer_deps="libmodplug" libmp3lame_encoder_deps="libmp3lame" libmp3lame_encoder_select="audio_frame_queue mpegaudioheader" +libmpeghdec_decoder_deps="libmpeghdec" liboapv_encoder_deps="liboapv" libopencore_amrnb_decoder_deps="libopencore_amrnb" libopencore_amrnb_encoder_deps="libopencore_amrnb" @@ -7184,6 +7187,7 @@ fi enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs +enabled libmpeghdec && require_pkg_config libmpeghdec "mpeghdec >= 3.0.0" mpeghdec/mpeghdecoder.h mpeghdecoder_init enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine || require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; } enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei -lnppif || diff --git a/doc/decoders.texi b/doc/decoders.texi index 13eb40f4dd..b7d80ca3d7 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -356,6 +356,15 @@ value is 0 (disabled). @end table +@section libmpeghdec + +libmpeghdec decoder wrapper. + +libmpeghdec allows libmpeghdec to decode the MPEG-H 3D audio codec. +Requires the presence of the libmpeghdec headers and library during +configuration. You need to explicitly configure the build with +@code{--enable-libmpeghdec}. + @section libopencore-amrnb libopencore-amrnb decoder wrapper. diff --git a/doc/general_contents.texi b/doc/general_contents.texi index b9dab580f1..9608ce219a 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -250,6 +250,14 @@ Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the instructions for installing the library. Then pass @code{--enable-libfdk-aac} to configure to enable it. +@subsection Fraunhofer MPEG-H 3D Audio decoder library + +FFmpeg can make use of the Fraunhofer MPEG-H decoder library for MPEG-H 3DA decoding. + +Go to @url{https://github.com/Fraunhofer-IIS/mpeghdec} and follow the +instructions for installing the library. +Then pass @code{--enable-libmpeghdec} to configure to enable it. + @subsection LC3 library FFmpeg can make use of the Google LC3 library for LC3 decoding & encoding. @@ -1344,6 +1352,8 @@ following image formats are supported: @item MP3 (MPEG audio layer 3) @tab E @tab IX @tab encoding supported through external library LAME, ADU MP3 and MP3onMP4 also supported @item MPEG-4 Audio Lossless Coding (ALS) @tab @tab X +@item MPEG-H 3D Audio @tab @tab E + @tab decoding supported through external library libmpeghdec @item MobiClip FastAudio @tab @tab X @item Musepack SV7 @tab @tab X @item Musepack SV8 @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ceac4e1159..e7fde87b22 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1180,6 +1180,7 @@ OBJS-$(CONFIG_LIBKVAZAAR_ENCODER) += libkvazaar.o OBJS-$(CONFIG_LIBLC3_ENCODER) += liblc3enc.o OBJS-$(CONFIG_LIBLC3_DECODER) += liblc3dec.o OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o +OBJS-$(CONFIG_LIBMPEGHDEC_DECODER) += libmpeghdec.o OBJS-$(CONFIG_LIBOAPV_ENCODER) += liboapvenc.o OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index ae48c414e8..d4b360f289 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -799,6 +799,7 @@ extern const FFCodec ff_libjxl_encoder; extern const FFCodec ff_liblc3_encoder; extern const FFCodec ff_liblc3_decoder; extern const FFCodec ff_libmp3lame_encoder; +extern const FFCodec ff_libmpeghdec_decoder; extern const FFCodec ff_liboapv_encoder; extern const FFCodec ff_libopencore_amrnb_encoder; extern const FFCodec ff_libopencore_amrnb_decoder; diff --git a/libavcodec/libmpeghdec.c b/libavcodec/libmpeghdec.c new file mode 100644 index 0000000000..e293ec3396 --- /dev/null +++ b/libavcodec/libmpeghdec.c @@ -0,0 +1,288 @@ +/* + * MPEG-H 3D Audio Decoder Wrapper + * Copyright (C) 2025 Fraunhofer Institute for Integrated Circuits IIS + * + * 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 + */ + +/* + * Please note that this FFmpeg Software is licensed under the LGPL-2.1 + * but is combined with software that is licensed under different terms, namely + * the "Software License for The Fraunhofer FDK MPEG-H Software". Fraunhofer + * as the initial licensor does not interpret the LGPL-2.1 as requiring + * distribution of the MPEG-H Software under the LGPL-2.1 if being distributed + * together with this FFmpeg Software. Therefore, downstream distribution of + * FFmpeg Software does not imply any right to redistribute the MPEG-H Software + * under the LGPL-2.1. + */ +#include <string.h> +#include <mpeghdec/mpeghdecoder.h> + +#include "libavutil/channel_layout.h" +#include "libavutil/frame.h" +#include "libavutil/mem.h" +#include "libavutil/opt.h" + +#include "codec_internal.h" +#include "decode.h" + +#define MAX_LOST_FRAMES 2 +// 32-bit int * 22.2 * max framesize * (max delay frames + 1) +#define MAX_OUTBUF_SIZE (sizeof(int32_t) * 24 * 3072 * (MAX_LOST_FRAMES + 1)) + +typedef struct MPEGH3DADecContext { + AVClass *av_class; + // pointer to the decoder + HANDLE_MPEGH_DECODER_CONTEXT decoder; + + // Internal values + int32_t *decoder_buffer; + int decoder_buffer_size; +} MPEGH3DADecContext; + +// private class definition for ffmpeg +static const AVClass mpegh3da_class = { + .class_name = "MPEG-H 3D Audio Decoder", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, +}; + +static av_cold int mpegh3dadec_close(AVCodecContext *avctx) +{ + MPEGH3DADecContext *s = avctx->priv_data; + + if (s->decoder) + mpeghdecoder_destroy(s->decoder); + s->decoder = NULL; + av_freep(&s->decoder_buffer); + + return 0; +} + +// Lookup CICP for FFmpeg channel layout, see: +// https://github.com/Fraunhofer-IIS/mpeghdec/wiki/MPEG-H-decoder-target-layou… +static av_cold int channel_layout_to_cicp(const AVChannelLayout *layout) +{ + const AVChannelLayout layout_7point2point3 = + (AVChannelLayout) AV_CHANNEL_LAYOUT_MASK( + 12, (AV_CH_LAYOUT_5POINT1POINT2 | AV_CH_SIDE_SURROUND_LEFT | + AV_CH_SIDE_SURROUND_RIGHT | AV_CH_TOP_BACK_CENTER | + AV_CH_LOW_FREQUENCY_2)); + const AVChannelLayout layout_5point1point6 = + (AVChannelLayout) AV_CHANNEL_LAYOUT_MASK( + 12, (AV_CH_LAYOUT_5POINT1POINT4_BACK | AV_CH_TOP_FRONT_CENTER | + AV_CH_TOP_CENTER)); + const AVChannelLayout layout_7point1point6 = + (AVChannelLayout) AV_CHANNEL_LAYOUT_MASK( + 14, (AV_CH_LAYOUT_7POINT1POINT4_BACK | AV_CH_TOP_FRONT_CENTER | + AV_CH_TOP_CENTER)); + + if (!av_channel_layout_compare(layout, + &(AVChannelLayout) AV_CHANNEL_LAYOUT_MONO)) { + return 1; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_STEREO)) { + return 2; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_SURROUND)) { + return 3; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_4POINT0)) { + return 4; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_5POINT0)) { + return 5; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_5POINT1)) { + return 6; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_7POINT1_WIDE)) { + return 7; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_2_1)) { + return 9; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_2_2)) { + return 10; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_6POINT1)) { + return 11; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_7POINT1)) { + return 12; + } else if (!av_channel_layout_compare( + layout, &(AVChannelLayout) AV_CHANNEL_LAYOUT_22POINT2)) { + return 13; + } else if (!av_channel_layout_compare( + layout, + &(AVChannelLayout) AV_CHANNEL_LAYOUT_5POINT1POINT2)) { + return 14; + } else if (!av_channel_layout_compare(layout, &layout_7point2point3)) { + return 15; + } else if (!av_channel_layout_compare( + layout, + &(AVChannelLayout) AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK)) { + return 16; + } else if (!av_channel_layout_compare(layout, &layout_5point1point6)) { + return 17; + } else if (!av_channel_layout_compare(layout, &layout_7point1point6)) { + return 18; + } else if (!av_channel_layout_compare( + layout, + &(AVChannelLayout) AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK)) { + return 19; + } + return 0; +} + +static av_cold int mpegh3dadec_init(AVCodecContext *avctx) +{ + int cicp; + + MPEGH3DADecContext *s = avctx->priv_data; + + if (avctx->ch_layout.nb_channels == 0) { + av_log(avctx, AV_LOG_ERROR, "Channel layout needs to be specified\n"); + return AVERROR(EINVAL); + } else if ((cicp = channel_layout_to_cicp(&avctx->ch_layout)) <= 0) { + av_log(avctx, AV_LOG_ERROR, "Unsupported channel layout\n"); + return AVERROR(EINVAL); + } + + s->decoder = NULL; + + avctx->delay = 0; + avctx->sample_fmt = AV_SAMPLE_FMT_S32; + avctx->sample_rate = 48000; + + s->decoder_buffer_size = MAX_OUTBUF_SIZE; + s->decoder_buffer = av_malloc(s->decoder_buffer_size); + if (!s->decoder_buffer) { + mpegh3dadec_close(avctx); + return AVERROR(ENOMEM); + } + + // initialize the decoder + s->decoder = mpeghdecoder_init(cicp); + if (s->decoder == NULL) { + av_log(avctx, AV_LOG_ERROR, "MPEG-H decoder library init failed.\n"); + mpegh3dadec_close(avctx); + return AVERROR_EXTERNAL; + } + + if (avctx->extradata_size) { + if (mpeghdecoder_setMhaConfig(s->decoder, avctx->extradata, + avctx->extradata_size)) { + av_log(avctx, AV_LOG_ERROR, "Unable to set MHA configuration\n"); + mpegh3dadec_close(avctx); + return AVERROR_INVALIDDATA; + } + } + + return 0; +} + +static int mpegh3dadec_decode_frame(AVCodecContext *avctx, AVFrame *frame, + int *got_frame_ptr, AVPacket *avpkt) +{ + MPEGH3DADecContext *s = avctx->priv_data; + int ret; + MPEGH_DECODER_ERROR err; + MPEGH_DECODER_OUTPUT_INFO out_info; + + if (!avctx->sample_rate) { + av_log(avctx, AV_LOG_ERROR, "Audio sample rate is not set"); + return AVERROR_INVALIDDATA; + } + + if (avpkt->data != NULL && avpkt->size > 0) { + if ((err = mpeghdecoder_processTimescale(s->decoder, avpkt->data, + avpkt->size, avpkt->pts, + avctx->sample_rate))) { + av_log(avctx, AV_LOG_ERROR, "mpeghdecoder_process() failed: %x\n", + err); + return AVERROR_INVALIDDATA; + } + } else { + // we are flushing + err = mpeghdecoder_flushAndGet(s->decoder); + + if (err != MPEGH_DEC_OK && err != MPEGH_DEC_FEED_DATA) + av_log(avctx, AV_LOG_WARNING, + "mpeghdecoder_flushAndGet() failed: %d\n", err); + } + + err = mpeghdecoder_getSamples(s->decoder, s->decoder_buffer, + s->decoder_buffer_size / sizeof(int32_t), + &out_info); + if (err == MPEGH_DEC_FEED_DATA) { + // no frames to produce at the moment + return avpkt->size; + } else if (err) { + av_log(avctx, AV_LOG_ERROR, "mpeghdecoder_getSamples() failed: %x\n", + err); + return AVERROR_UNKNOWN; + } + + frame->nb_samples = avctx->frame_size = out_info.numSamplesPerChannel; + frame->sample_rate = avctx->sample_rate = out_info.sampleRate; + frame->pts = out_info.ticks; + frame->time_base.num = 1; + frame->time_base.den = out_info.sampleRate; + + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + + memcpy(frame->extended_data[0], s->decoder_buffer, + avctx->ch_layout.nb_channels * avctx->frame_size * + av_get_bytes_per_sample(avctx->sample_fmt)); + + *got_frame_ptr = 1; + return ret = avpkt->size; +} + +static av_cold void mpegh3dadec_flush(AVCodecContext *avctx) +{ + MPEGH_DECODER_ERROR err; + MPEGH3DADecContext *s = avctx->priv_data; + + if (!s->decoder) + return; + + err = mpeghdecoder_flush(s->decoder); + + if (err != MPEGH_DEC_OK && err != MPEGH_DEC_FEED_DATA) + av_log(avctx, AV_LOG_WARNING, "mpeghdecoder_flush failed: %d\n", err); +} + +const FFCodec ff_libmpeghdec_decoder = { + .p.name = "libmpeghdec", + CODEC_LONG_NAME("libmpeghdec (MPEG-H 3D Audio)"), + .p.priv_class = &mpegh3da_class, + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_MPEGH_3D_AUDIO, + .p.capabilities = + AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_CHANNEL_CONF, + .priv_data_size = sizeof(MPEGH3DADecContext), + .init = mpegh3dadec_init, + FF_CODEC_DECODE_CB(mpegh3dadec_decode_frame), + .close = mpegh3dadec_close, + .flush = mpegh3dadec_flush, + CODEC_SAMPLEFMTS(AV_SAMPLE_FMT_S32), + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .p.wrapper_name = "libmpeghdec", +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 9b8c267529..82a86fe9d9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 15 +#define LIBAVCODEC_VERSION_MINOR 16 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ ----------------------------------------------------------------------- Summary of changes: Changelog | 1 + configure | 4 + doc/decoders.texi | 9 ++ doc/general_contents.texi | 10 ++ libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/libmpeghdec.c | 288 ++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 8 files changed, 315 insertions(+), 1 deletion(-) create mode 100644 libavcodec/libmpeghdec.c hooks/post-receive --

1 0

[ffmpeg] branch master updated. e5f82ab868 Revert "lavc/libsvtav1: set packet durations"
by ffmpeg-git＠ffmpeg.org 24 Sep '25

24 Sep '25

The branch, master has been updated via e5f82ab8686b3c6193a3f718f53dbef9436b4318 (commit) from 17d5759bd99ab304c497ec149d493bc6ba1c6b52 (commit) - Log ----------------------------------------------------------------- commit e5f82ab8686b3c6193a3f718f53dbef9436b4318 Author: rcombs <rcombs(a)rcombs.me> AuthorDate: Tue Sep 23 20:21:44 2025 -0700 Commit: rcombs <rcombs(a)rcombs.me> CommitDate: Tue Sep 23 20:22:33 2025 -0700 Revert "lavc/libsvtav1: set packet durations" This reverts commit 5c9b2027bc48ae5d39b0d82696895f0834788242. This doesn't actually work the way it'd appeared to in testing; the output was based on frame *encode latency*. diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 8ac5fd2d04..c6a0ff90bc 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -520,7 +520,6 @@ static int eb_send_frame(AVCodecContext *avctx, const AVFrame *frame) headerPtr->flags = 0; headerPtr->p_app_private = NULL; headerPtr->pts = frame->pts; - headerPtr->n_tick_count = frame->duration; switch (frame->pict_type) { case AV_PICTURE_TYPE_I: @@ -637,7 +636,6 @@ static int eb_receive_packet(AVCodecContext *avctx, AVPacket *pkt) pkt->size = headerPtr->n_filled_len; pkt->pts = headerPtr->pts; pkt->dts = headerPtr->dts; - pkt->duration = headerPtr->n_tick_count; switch (headerPtr->pic_type) { case EB_AV1_KEY_PICTURE: ----------------------------------------------------------------------- Summary of changes: libavcodec/libsvtav1.c | 2 -- 1 file changed, 2 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 17d5759bd9 avcodec/x86/apv_dsp: Don't export arrays unnecessarily
by ffmpeg-git＠ffmpeg.org 24 Sep '25

24 Sep '25

The branch, master has been updated via 17d5759bd99ab304c497ec149d493bc6ba1c6b52 (commit) from f18b1e23890c1179d41c07f2c195c56fb90ea072 (commit) - Log ----------------------------------------------------------------- commit 17d5759bd99ab304c497ec149d493bc6ba1c6b52 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Wed Sep 24 00:10:08 2025 +0200 Commit: James Almer <jamrial(a)gmail.com> CommitDate: Wed Sep 24 01:21:32 2025 +0000 avcodec/x86/apv_dsp: Don't export arrays unnecessarily The const here is unnecessary, because everything inside SECTION_RODATA is automatically const and using it exports these objects from the object file because const is a macro in x86inc.asm. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/x86/apv_dsp.asm b/libavcodec/x86/apv_dsp.asm index 60e0f03e16..e2f30fff13 100644 --- a/libavcodec/x86/apv_dsp.asm +++ b/libavcodec/x86/apv_dsp.asm @@ -23,7 +23,7 @@ SECTION_RODATA 32 ; Full matrix for row transform. -const tmatrix_row +tmatrix_row: dw 64, 89, 84, 75, 64, 50, 35, 18 dw 64, -18, -84, 50, 64, -75, -35, 89 dw 64, 75, 35, -18, -64, -89, -84, -50 @@ -34,10 +34,10 @@ const tmatrix_row dw 64, -89, 84, -75, 64, -50, 35, -18 ; Constant pairs for broadcast in column transform. -const tmatrix_col_even +tmatrix_col_even: dw 64, 64, 64, -64 dw 84, 35, 35, -84 -const tmatrix_col_odd +tmatrix_col_odd: dw 89, 75, 50, 18 dw 75, -18, -89, -50 dw 50, -89, 18, 75 ----------------------------------------------------------------------- Summary of changes: libavcodec/x86/apv_dsp.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. f18b1e2389 avfilter/af_whisper: fix int64 printf format
by ffmpeg-git＠ffmpeg.org 23 Sep '25

23 Sep '25

The branch, master has been updated via f18b1e23890c1179d41c07f2c195c56fb90ea072 (commit) from 7c78a63476da6360063d45f74cb1d9fc94047278 (commit) - Log ----------------------------------------------------------------- commit f18b1e23890c1179d41c07f2c195c56fb90ea072 Author: Vittorio Palmisano <vpalmisano(a)gmail.com> AuthorDate: Sun Sep 21 15:19:51 2025 +0200 Commit: michaelni <michael(a)niedermayer.cc> CommitDate: Tue Sep 23 23:35:58 2025 +0000 avfilter/af_whisper: fix int64 printf format Use PRId64 for printing int64_t values in the SRT output. diff --git a/libavfilter/af_whisper.c b/libavfilter/af_whisper.c index 663fe446bb..90b2fc89a0 100644 --- a/libavfilter/af_whisper.c +++ b/libavfilter/af_whisper.c @@ -150,7 +150,7 @@ static int init(AVFilterContext *ctx) } av_log(ctx, AV_LOG_INFO, - "Whisper filter initialized: model: %s lang: %s queue: %ld ms\n", + "Whisper filter initialized: model: %s lang: %s queue: %" PRId64 " ms\n", wctx->model_path, wctx->language, wctx->queue / 1000); return 0; @@ -194,7 +194,7 @@ static void run_transcription(AVFilterContext *ctx, AVFrame *frame, int samples) const float duration = (float) samples / WHISPER_SAMPLE_RATE; av_log(ctx, AV_LOG_INFO, - "run transcription at %ld ms, %d/%d samples (%.2f seconds)...\n", + "run transcription at %" PRId64 " ms, %d/%d samples (%.2f seconds)...\n", timestamp_ms, samples, wctx->audio_buffer_fill_size, duration); struct whisper_full_params params = whisper_full_default_params(WHISPER_SAMPLING_GREEDY); @@ -228,7 +228,7 @@ static void run_transcription(AVFilterContext *ctx, AVFrame *frame, int samples) const int64_t t0_ms = whisper_full_get_segment_t0(wctx->ctx_wsp, i) * 10; const int64_t t1_ms = whisper_full_get_segment_t1(wctx->ctx_wsp, i) * 10; - av_log(ctx, AV_LOG_DEBUG, " [%ld-%ld%s]: \"%s\"\n", + av_log(ctx, AV_LOG_DEBUG, " [%" PRId64 "-%" PRId64 "%s]: \"%s\"\n", timestamp_ms + t0_ms, timestamp_ms + t1_ms, turn ? " (turn)" : "", text_cleaned); if (segments_text) { @@ -246,13 +246,13 @@ static void run_transcription(AVFilterContext *ctx, AVFrame *frame, int samples) if (!av_strcasecmp(wctx->format, "srt")) { buf = av_asprintf - ("%d\n%02ld:%02ld:%02ld,%03ld --> %02ld:%02ld:%02ld,%03ld\n%s\n\n", + ("%d\n%02" PRId64 ":%02" PRId64 ":%02" PRId64 ",%03" PRId64 " --> %02" PRId64 ":%02" PRId64 ":%02" PRId64 ",%03" PRId64 "\n%s\n\n", wctx->index, start_t / 3600000, (start_t / 60000) % 60, (start_t / 1000) % 60, start_t % 1000, end_t / 3600000, (end_t / 60000) % 60, (end_t / 1000) % 60, end_t % 1000, text_cleaned); } else if (!av_strcasecmp(wctx->format, "json")) { - buf = av_asprintf("{\"start\":%ld,\"end\":%ld,\"text\":\"%s\"}\n", start_t, end_t, text_cleaned); + buf = av_asprintf("{\"start\":%" PRId64 ",\"end\":%" PRId64 ",\"text\":\"%s\"}\n", start_t, end_t, text_cleaned); } else buf = av_strdup(text_cleaned); ----------------------------------------------------------------------- Summary of changes: libavfilter/af_whisper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) hooks/post-receive --

1 0