June 2026 - ffmpeg-devel - lists.ffmpeg.org

[PR] [9.0] Backport response file and makedef changes (PR #23654)
by Martin Storsjö 30 Jun '26

30 Jun '26

PR #23654 opened by Martin Storsjö (mstorsjo) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23654 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23654.patch This should fix building shared libraries on Windows with lots of external libraries enabled, and fix building with response files with busybox. From 228c714a9fe10915618f11c1cb1505abcebf81ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> Date: Mon, 8 Jun 2026 09:34:00 +0000 Subject: [PATCH 1/2] configure: Test for response file support in a way that works with busybox-w32 Don't use /dev/null as test input file for the test for response file support. Busybox on Windows does provide POSIX utilities to the point of being able to build and test ffmpeg, but it doesn't provide full POSIX emulation like msys2 and cygwin do. Busybox utils do handle paths like /dev/null themselves. But when busybox invokes a native Windows executable (like the "$ar" tool in this test), it passes such a path as-is. Msys2 on the other hand rewrites unixy paths in command line parameters - even when prefixed; e.g. "@/dev/null" gets rewritten into "@nul". Instead of testing with a /dev/null input, test with a real temp file instead. (cherry picked from commit 32d7e9d71e2cf5d85728559de904044c520ba2c0) --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 8941ced1f4..89777c0899 100755 --- a/configure +++ b/configure @@ -5144,6 +5144,7 @@ tmpfile TMPO .o tmpfile TMPS .S tmpfile TMPSH .sh tmpfile TMPV .ver +tmpfile TMPRSP .rsp unset -f mktemp @@ -8268,7 +8269,8 @@ esac if [ "$response_files" != "no" ]; then ar_out=${FFTMPDIR}/test$LIBSUF - respfile="@/dev/null" + echo > "$TMPRSP" + respfile="@$TMPRSP" out_arg="$(echo $ar_o | sed "s;\$@;$ar_out;g")" if test_cmd $ar $arflags $out_arg $respfile; then response_files="yes" -- 2.52.0 From 9d97419239ba9bc78168315f514ac513a329f26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> Date: Wed, 24 Jun 2026 11:39:18 +0000 Subject: [PATCH 2/2] configure: Pass the .objs response file to makedef This fixes generating shared libraries with a toolchain that requires makedef (MSVC, or mingw toolchains with LLD, that lacks support for --version-script). This uses the existing response file generated for linking, by splitting out the choice of input parameter to makedef to a variable expanded by make. This avoids relying on "echo" within makedef supporting long command lines; msys2/cygwin shells handle it fine, while busybox doesn't. (cherry picked from commit 8512161c81242e11158133bed019d5a51b089ca8) --- compat/windows/makedef | 5 +++++ configure | 9 +++++++-- ffbuild/library.mak | 5 +++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/compat/windows/makedef b/compat/windows/makedef index af42f08fd5..c5755d6cca 100755 --- a/compat/windows/makedef +++ b/compat/windows/makedef @@ -33,6 +33,11 @@ if [ ! -f "$vscript" ]; then fi for object in "$@"; do + case "$object" in + @*) + object="${object#@}" + ;; + esac if [ ! -f "$object" ]; then echo "Object does not exist: ${object}" >&2 exit 1 diff --git a/configure b/configure index 89777c0899..785e23fb16 100755 --- a/configure +++ b/configure @@ -6250,7 +6250,7 @@ case $target_os in SLIB_INSTALL_LINKS= SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' SLIB_INSTALL_EXTRA_LIB='lib$(SLIBNAME:$(SLIBSUF)=.dll.a) $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)' - SLIB_CREATE_DEF_CMD='EXTERN_PREFIX="$(EXTERN_PREFIX)" AR="$(AR_CMD)" NM="$(NM_CMD)" $(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)' + SLIB_CREATE_DEF_CMD='EXTERN_PREFIX="$(EXTERN_PREFIX)" AR="$(AR_CMD)" NM="$(NM_CMD)" $(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(SLIB_CREATE_DEF_INPUTS) > $$(@:$(SLIBSUF)=.def)' SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--disable-auto-image-base $$(@:$(SLIBSUF)=.def)' enabled x86_64 && objformat="win64" || objformat="win32" dlltool="${cross_prefix}dlltool" @@ -6289,7 +6289,7 @@ case $target_os in SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' - SLIB_CREATE_DEF_CMD='LDFLAGS="$(LDFLAGS)" EXTERN_PREFIX="$(EXTERN_PREFIX)" $(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)' + SLIB_CREATE_DEF_CMD='LDFLAGS="$(LDFLAGS)" EXTERN_PREFIX="$(EXTERN_PREFIX)" $(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(SLIB_CREATE_DEF_INPUTS) > $$(@:$(SLIBSUF)=.def)' SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)' SLIB_INSTALL_LINKS= SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' @@ -8768,6 +8768,11 @@ SLIBNAME=${SLIBNAME} SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION} SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR} SLIB_CREATE_DEF_CMD=${SLIB_CREATE_DEF_CMD} +ifeq (\$(RESPONSE_FILES),yes) +SLIB_CREATE_DEF_INPUTS=@\$\$@.objs +else +SLIB_CREATE_DEF_INPUTS=\$(OBJS) +endif SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD} SLIB_INSTALL_NAME=${SLIB_INSTALL_NAME} SLIB_INSTALL_LINKS=${SLIB_INSTALL_LINKS} diff --git a/ffbuild/library.mak b/ffbuild/library.mak index 93b3b2e5a7..2759a73a5c 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -86,14 +86,15 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SUBDIR)lib$(NAME).ver - $(SLIB_CREATE_DEF_CMD) ifeq ($(RESPONSE_FILES),yes) ifeq ($(HAVE_BUILTIN_FILE),yes) $$(file >$$@.objs,$$(filter %.o,$$^)) else $(Q)echo $$(filter %.o,$$^) > $$@.objs endif - +endif + $(SLIB_CREATE_DEF_CMD) +ifeq ($(RESPONSE_FILES),yes) $$(call LINK,$$(call $(NAME)LINK_SO_ARGS) $$(LD_O) @$$@.objs $$(call $(NAME)LINK_EXTRA)) else $$(call LINK,$$(call $(NAME)LINK_SO_ARGS) $$(LD_O) $$(filter %.o,$$^) $$(call $(NAME)LINK_EXTRA)) -- 2.52.0

1 0

[PR] arm: Avoid warnings about redefining HWCAP constants (PR #23653)
by Martin Storsjö 30 Jun '26

30 Jun '26

PR #23653 opened by Martin Storsjö (mstorsjo) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23653 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23653.patch Before ced4a6ebc9e7cd92d0ca9b9fb8f9d1013d23cbfa, we used constants in the form HWCAP_NEON. In that commit, they were renamed to HWCAP_ARM_NEON, to match the pattern used for aarch64 and PPC. On PPC our naming is entirely custom to us, upstream headers (from e.g. glibc) use an entirely different naming. On aarch64, we use names similar to the system headers, where they are named e.g. HWCAP_CRC32, but we add an extra prefix, naming them HWCAP_AARCH64_CRC32, to avoid any potential conflict and redefinition issues. (In practice, this isn't needed - both glibc, musl and BSDs provide the aarch64 HWCAP_ defines with the same names and same literal expansion.) However, on ARM, the landscape of the HWCAP defines is much less consistent. On glibc, <bits/hwcap.h> (which gets included by <sys/auxv.h>) provides most constants with an HWCAP_ARM_ prefix. (The couple newest constants lack that prefix though.) The kernel headers, in <asm/hwcap.h>) define them with just a HWCAP_ prefix, i.e. HWCAP_ARM_NEON vs HWCAP_NEON. For the actual expansion, <asm/hwcap.h> defines HWCAP_NEON as (1 << 12), while glibc <bits/hwcap.h> defines HWCAP_ARM_NEON as 4096. Musl's <bits/hwcap.h> defines both HWCAP_NEON and HWCAP_ARM_NEON, as (1 << 12). The BSDs define HWCAP_NEON in <elf.h>, defined as 0x00001000. Thus, all system headers define the constant with differing expansions. And they differ in which name they expose for the constants. But we provide our definitions in any case. Due to all this, wrap our definitions in #ifndefs, to avoid warnings about redefining the constants on glibc. # Summary of changes Briefly describe what this PR does and why.  From b97f67ad2d68a77af91481a867cf0ee87923b233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> Date: Tue, 30 Jun 2026 13:39:09 +0300 Subject: [PATCH] arm: Avoid warnings about redefining HWCAP constants Before ced4a6ebc9e7cd92d0ca9b9fb8f9d1013d23cbfa, we used constants in the form HWCAP_NEON. In that commit, they were renamed to HWCAP_ARM_NEON, to match the pattern used for aarch64 and PPC. On PPC our naming is entirely custom to us, upstream headers (from e.g. glibc) use an entirely different naming. On aarch64, we use names similar to the system headers, where they are named e.g. HWCAP_CRC32, but we add an extra prefix, naming them HWCAP_AARCH64_CRC32, to avoid any potential conflict and redefinition issues. (In practice, this isn't needed - both glibc, musl and BSDs provide the aarch64 HWCAP_ defines with the same names and same literal expansion.) However, on ARM, the landscape of the HWCAP defines is much less consistent. On glibc, <bits/hwcap.h> (which gets included by <sys/auxv.h>) provides most constants with an HWCAP_ARM_ prefix. (The couple newest constants lack that prefix though.) The kernel headers, in <asm/hwcap.h>) define them with just a HWCAP_ prefix, i.e. HWCAP_ARM_NEON vs HWCAP_NEON. For the actual expansion, <asm/hwcap.h> defines HWCAP_NEON as (1 << 12), while glibc <bits/hwcap.h> defines HWCAP_ARM_NEON as 4096. Musl's <bits/hwcap.h> defines both HWCAP_NEON and HWCAP_ARM_NEON, as (1 << 12). The BSDs define HWCAP_NEON in <elf.h>, defined as 0x00001000. Thus, all system headers define the constant with differing expansions. And they differ in which name they expose for the constants. But we provide our definitions in any case. Due to all this, wrap our definitions in #ifndefs, to avoid warnings about redefining the constants on glibc. --- libavutil/arm/cpu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c index 2e2977efc9..2f6d558380 100644 --- a/libavutil/arm/cpu.c +++ b/libavutil/arm/cpu.c @@ -46,13 +46,25 @@ #define AT_HWCAP 16 #endif -/* Relevant HWCAP values from kernel headers */ +/* Relevant HWCAP values from <sys/auxv.h> that includes <bits/hwcap.h> */ +#ifndef HWCAP_ARM_VFP #define HWCAP_ARM_VFP (1 << 6) +#endif +#ifndef HWCAP_ARM_EDSP #define HWCAP_ARM_EDSP (1 << 7) +#endif +#ifndef HWCAP_ARM_THUMBEE #define HWCAP_ARM_THUMBEE (1 << 11) +#endif +#ifndef HWCAP_ARM_NEON #define HWCAP_ARM_NEON (1 << 12) +#endif +#ifndef HWCAP_ARM_VFPv3 #define HWCAP_ARM_VFPv3 (1 << 13) +#endif +#ifndef HWCAP_ARM_TLS #define HWCAP_ARM_TLS (1 << 15) +#endif static int get_auxval(uint32_t *hwcap) { -- 2.52.0

1 0

[PR] avcodec/aarch64: add NEON lfe_x96_fixed for DCA DSP (PR #23652)
by kjg0724 30 Jun '26

30 Jun '26

PR #23652 opened by kjg0724 URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23652 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23652.patch Implement `ff_lfe_x96_fixed_neon`, an AArch64 NEON fixed-point LFE x96 interpolation filter. Each input sample generates two output samples: ``` a = coeff_a * src[i] + coeff_b * prev b = coeff_b * src[i] + coeff_a * prev ``` where `coeff_a = 2097471` and `coeff_b = 6291137` (approximately 0.25 and 0.75 in 2^23 fixed-point). Two input samples are processed per iteration using SMULL/SMLAL for int32×int32 to int64 widening multiply-accumulate, SQRSHRN #23 for `norm23`, and SQSHL/SSHR #8 for `clip23`. ZIP1 interleaves the paired output values before storing. Benchmarked with `make fate` checkasm on Apple M1: ``` lfe_x96_fixed_c: ~190 cycles lfe_x96_fixed_neon: ~68 cycles (~2.8x) ``` Also adds a checkasm test for `lfe_x96_fixed`. From 9aac704b44058999747c6523caa7395dfa97845e Mon Sep 17 00:00:00 2001 From: Jeongkeun Kim <variety0724(a)gmail.com> Date: Tue, 28 Apr 2026 13:51:25 +0900 Subject: [PATCH 1/2] tests/checkasm/llviddsp: fix add_left_pred_int16 buffer compare size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dst0/dst1 are uint16_t* allocated as width * sizeof(uint16_t), but the memcmp at the end of check_add_left_pred_16 only compared `width` bytes — missing the second half of each buffer. Same pattern used correctly in tests/checkasm/huffyuvdsp.c (memcmp with width * sizeof()). While at it, fix missing whitespace around & and || on the same line. Fixes: fbe91487797c ("checkasm/llviddsp : add test for other dsp func") Signed-off-by: Jeongkeun Kim <variety0724(a)gmail.com> --- tests/checkasm/llviddsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checkasm/llviddsp.c b/tests/checkasm/llviddsp.c index a8245b0d94..1094638229 100644 --- a/tests/checkasm/llviddsp.c +++ b/tests/checkasm/llviddsp.c @@ -145,7 +145,7 @@ static void check_add_left_pred_16(LLVidDSPContext *c, unsigned mask, int width, res0 = call_ref(dst0, src0, mask, width, acc); res1 = call_new(dst1, src1, mask, width, acc); - if ((res0 &0xFFFF) != (res1 &0xFFFF)|| memcmp(dst0, dst1, width)) + if ((res0 & 0xFFFF) != (res1 & 0xFFFF) || memcmp(dst0, dst1, width * sizeof(*dst0))) fail(); bench_new(dst1, src1, mask, width, acc); -- 2.52.0 From b777d35ba7fbf87b39add21b90621a1bb13bdadc Mon Sep 17 00:00:00 2001 From: Jeongkeun Kim <variety0724(a)gmail.com> Date: Tue, 30 Jun 2026 11:31:05 +0900 Subject: [PATCH 2/2] avcodec/aarch64: add NEON lfe_x96_fixed for DCA DSP Implement ff_lfe_x96_fixed_neon, an AArch64 NEON fixed-point LFE x96 interpolation filter. Each input sample generates two output samples: a = coeff_a * src[i] + coeff_b * prev b = coeff_b * src[i] + coeff_a * prev where coeff_a = 2097471 and coeff_b = 6291137 (approximately 0.25 and 0.75 in 2^23 fixed-point). Two input samples are processed per iteration using SMULL/SMLAL for int32x32 to int64 widening multiply-accumulate, SQRSHRN #23 for norm23, and SQSHL/SSHR #8 for clip23. ZIP1 interleaves the paired output values before storing. Measured on Apple M1: lfe_x96_fixed_c: ~190 cycles lfe_x96_fixed_neon: ~68 cycles (~2.8x) Also adds a checkasm test for lfe_x96_fixed. --- libavcodec/aarch64/dcadsp_init_aarch64.c | 3 +++ libavcodec/aarch64/dcadsp_neon.S | 31 ++++++++++++++++++++++++ tests/checkasm/dcadsp.c | 23 ++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/libavcodec/aarch64/dcadsp_init_aarch64.c b/libavcodec/aarch64/dcadsp_init_aarch64.c index 1fc6ec7a32..acb4194e9d 100644 --- a/libavcodec/aarch64/dcadsp_init_aarch64.c +++ b/libavcodec/aarch64/dcadsp_init_aarch64.c @@ -30,6 +30,8 @@ void ff_lfe_fir0_float_neon(float *pcm_samples, const int32_t *lfe_samples, const float *filter_coeff, ptrdiff_t npcmblocks); void ff_lfe_fir1_float_neon(float *pcm_samples, const int32_t *lfe_samples, const float *filter_coeff, ptrdiff_t npcmblocks); +void ff_lfe_x96_fixed_neon(int32_t *dst, const int32_t *src, + int32_t *hist, ptrdiff_t len); av_cold void ff_dcadsp_init_aarch64(DCADSPContext *s) { @@ -38,5 +40,6 @@ av_cold void ff_dcadsp_init_aarch64(DCADSPContext *s) if (have_neon(cpu_flags)) { s->lfe_fir_float[0] = ff_lfe_fir0_float_neon; s->lfe_fir_float[1] = ff_lfe_fir1_float_neon; + s->lfe_x96_fixed = ff_lfe_x96_fixed_neon; } } diff --git a/libavcodec/aarch64/dcadsp_neon.S b/libavcodec/aarch64/dcadsp_neon.S index af149767fd..ae7ce7f906 100644 --- a/libavcodec/aarch64/dcadsp_neon.S +++ b/libavcodec/aarch64/dcadsp_neon.S @@ -99,3 +99,34 @@ function ff_lfe_fir1_float_neon, export=1 b.gt .Louter1 ret endfunc + +function ff_lfe_x96_fixed_neon, export=1 + ldr w4, [x2] + mov w9, #0x013F + movk w9, #0x0020, lsl #16 + dup v0.2s, w9 + mov w9, #0xFEC1 + movk w9, #0x005F, lsl #16 + dup v1.2s, w9 +.Lloopx96d: + ld1 {v2.2s}, [x1], #8 + dup v3.2s, w4 + ins v3.s[1], v2.s[0] + smull v4.2d, v2.2s, v0.2s + smlal v4.2d, v3.2s, v1.2s + smull v5.2d, v2.2s, v1.2s + smlal v5.2d, v3.2s, v0.2s + sqrshrn v16.2s, v4.2d, #23 + sqrshrn v17.2s, v5.2d, #23 + sqshl v16.2s, v16.2s, #8 + sshr v16.2s, v16.2s, #8 + sqshl v17.2s, v17.2s, #8 + sshr v17.2s, v17.2s, #8 + zip1 v18.4s, v16.4s, v17.4s + st1 {v18.4s}, [x0], #16 + umov w4, v2.s[1] + subs x3, x3, #2 + b.gt .Lloopx96d + str w4, [x2] + ret +endfunc diff --git a/tests/checkasm/dcadsp.c b/tests/checkasm/dcadsp.c index 809a0a0974..0879977208 100644 --- a/tests/checkasm/dcadsp.c +++ b/tests/checkasm/dcadsp.c @@ -86,6 +86,26 @@ static void test_lfe_fir_fixed(void) bench_new(dst1, lfe + LFE_HISTORY, coeffs, N); } +static void test_lfe_x96_fixed(const DCADSPContext *dca) +{ + LOCAL_ALIGNED_16(int32_t, dst0, [2 * BUF_SIZE]); + LOCAL_ALIGNED_16(int32_t, dst1, [2 * BUF_SIZE]); + LOCAL_ALIGNED_16(int32_t, src, [BUF_SIZE]); + int32_t hist0, hist1; + + declare_func(void, int32_t *dst, const int32_t *src, int32_t *hist, ptrdiff_t len); + + if (check_func(dca->lfe_x96_fixed, "lfe_x96_fixed")) { + randomize(src, BUF_SIZE); + hist0 = hist1 = (int16_t)rnd(); + call_ref(dst0, src, &hist0, BUF_SIZE); + call_new(dst1, src, &hist1, BUF_SIZE); + if (memcmp(dst0, dst1, 2 * BUF_SIZE * sizeof(int32_t))) + fail(); + bench_new(dst1, src, &hist1, BUF_SIZE); + } +} + void checkasm_check_dcadsp(void) { DCADSPContext dca; @@ -98,4 +118,7 @@ void checkasm_check_dcadsp(void) if (check_func(dca.lfe_fir_fixed, "lfe_fir_fixed")) test_lfe_fir_fixed(); report("lfe_fir_fixed"); + + test_lfe_x96_fixed(&dca); + report("lfe_x96_fixed"); } -- 2.52.0

1 0

[PR] avcodec/(e)ac3enc: drain the buffered samples at the end of encoding (PR #23651)
by James Almer 30 Jun '26

30 Jun '26

PR #23651 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23651 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23651.patch When encoding a stream with an amount of samples multiple of a block, the last the last 256 samples would be lost as the encoders were not marked as AV_CODEC_CAP_DELAY. This can be easily reproduced with: `ffmpeg -f lavfi -i sine -ac 2 -af atrim=start_sample=0:end_sample=4608 -c:a eac3 -f framecrc -` From 378faf5bac08d2f856996e8d7a320e2bdaf0ddc7 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Mon, 29 Jun 2026 19:24:39 -0300 Subject: [PATCH] avcodec/ac3enc: drain the buffered samples at the end of encoding When encoding a stream with an amount of samples multiple of a block, the last the last 256 samples would be lost as the encoders were not marked as AV_CODEC_CAP_DELAY. This can be easily reproduced with: ffmpeg -f lavfi -i sine -ac 2 -af atrim=start_sample=0:end_sample=4608 -c:a eac3 -f framecrc - Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavcodec/ac3enc.c | 34 ++++++++++++++++++++++++++----- libavcodec/ac3enc.h | 6 +++++- libavcodec/ac3enc_fixed.c | 3 ++- libavcodec/ac3enc_float.c | 3 ++- libavcodec/ac3enc_template.c | 29 ++++++++++++++++++++++---- libavcodec/eac3enc.c | 3 ++- tests/fate/ac3.mak | 18 +++++++--------- tests/ref/fate/ac3-fixed-encode-2 | 1 + tests/ref/fate/autorotate | 2 +- tests/ref/fate/shortest | 1 + tests/ref/fate/unknown_layout-ac3 | 2 +- tests/ref/lavf/rm | 2 +- 12 files changed, 77 insertions(+), 27 deletions(-) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 5a1a3ab63a..9172348712 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1982,8 +1982,18 @@ int ff_ac3_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr) { AC3EncodeContext *const s = avctx->priv_data; + int discard_padding; int ret; + /* add current frame to queue */ + if (frame) { + if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) + return ret; + } else { + if (!s->afq.remaining_samples || (!s->afq.frame_alloc && !s->afq.frame_count)) + return 0; + } + if (s->options.allow_per_frame_metadata) { ret = ac3_validate_metadata(s); if (ret) @@ -1993,7 +2003,7 @@ int ff_ac3_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (s->bit_alloc.sr_code == 1 || s->eac3) ac3_adjust_frame_size(s); - s->encode_frame(s, frame->extended_data); + s->encode_frame(s, frame); ac3_apply_rematrixing(s); @@ -2014,8 +2024,17 @@ int ff_ac3_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return ret; ac3_output_frame(s, avpkt->data); - if (frame->pts != AV_NOPTS_VALUE) - avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->initial_padding); + ff_af_queue_remove(&s->afq, avctx->frame_size, &avpkt->pts, + &avpkt->duration); + + discard_padding = avctx->frame_size - ff_samples_from_time_base(avctx, avpkt->duration); + if (discard_padding > 0) { + uint8_t *side_data = + av_packet_new_side_data(avpkt, AV_PKT_DATA_SKIP_SAMPLES, 10); + if (!side_data) + return AVERROR(ENOMEM); + AV_WL32(side_data + 4, discard_padding); + } *got_packet_ptr = 1; return 0; @@ -2155,8 +2174,10 @@ av_cold int ff_ac3_encode_close(AVCodecContext *avctx) { AC3EncodeContext *s = avctx->priv_data; - for (int ch = 0; ch < s->channels; ch++) + for (int ch = 0; ch < s->channels; ch++) { av_freep(&s->planar_samples[ch]); + av_freep(&s->input_samples[ch]); + } av_freep(&s->bap_buffer); av_freep(&s->bap1_buffer); av_freep(&s->mdct_coef_buffer); @@ -2416,7 +2437,8 @@ static av_cold int allocate_buffers(AC3EncodeContext *s) for (int ch = 0; ch < s->channels; ch++) { s->planar_samples[ch] = av_mallocz(AC3_BLOCK_SIZE * sampletype_size); - if (!s->planar_samples[ch]) + s->input_samples[ch] = av_mallocz(AC3_BLOCK_SIZE * sampletype_size * s->num_blocks); + if (!s->planar_samples[ch] || !s->input_samples[ch]) return AVERROR(ENOMEM); } @@ -2516,6 +2538,8 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx) dprint_options(s); + ff_af_queue_init(avctx, &s->afq); + ff_thread_once(&init_static_once, exponent_init); return 0; diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h index 5e98ad188b..3e92af17f0 100644 --- a/libavcodec/ac3enc.h +++ b/libavcodec/ac3enc.h @@ -37,6 +37,7 @@ #include "ac3.h" #include "ac3defs.h" #include "ac3dsp.h" +#include "audio_frame_queue.h" #include "avcodec.h" #include "codec_internal.h" #include "mathops.h" @@ -233,6 +234,7 @@ typedef struct AC3EncodeContext { int exponent_bits; ///< number of bits used for exponents uint8_t *planar_samples[AC3_MAX_CHANNELS - 1]; + uint8_t *input_samples[AC3_MAX_CHANNELS - 1]; uint8_t *bap_buffer; uint8_t *bap1_buffer; CoefType *mdct_coef_buffer; @@ -252,8 +254,10 @@ typedef struct AC3EncodeContext { uint8_t *ref_bap [AC3_MAX_CHANNELS][AC3_MAX_BLOCKS]; ///< bit allocation pointers (bap) int ref_bap_set; ///< indicates if ref_bap pointers have been set + AudioFrameQueue afq; + /** fixed vs. float function pointers */ - void (*encode_frame)(struct AC3EncodeContext *s, uint8_t * const *samples); + void (*encode_frame)(struct AC3EncodeContext *s, const AVFrame *frame); /* AC-3 vs. E-AC-3 function pointers */ void (*output_frame_header)(struct AC3EncodeContext *s, struct PutBitContext *pb); diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index 42530b0ea1..876bb6bbc6 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -114,7 +114,8 @@ const FFCodec ff_ac3_fixed_encoder = { CODEC_LONG_NAME("ATSC A/52A (AC-3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AC3, - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | + AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, .priv_data_size = sizeof(AC3EncodeContext), .init = ac3_fixed_encode_init, FF_CODEC_ENCODE_CB(ff_ac3_encode_frame), diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index 0ae7ddd7eb..974c38ac25 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -116,7 +116,8 @@ const FFCodec ff_ac3_encoder = { CODEC_LONG_NAME("ATSC A/52A (AC-3)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AC3, - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | + AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, .priv_data_size = sizeof(AC3EncodeContext), .init = ff_ac3_float_encode_init, FF_CODEC_ENCODE_CB(ff_ac3_encode_frame), diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index 049666fdca..6d662c74da 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -49,9 +49,10 @@ * This applies the KBD window and normalizes the input to reduce precision * loss due to fixed-point calculations. */ -static void apply_mdct(AC3EncodeContext *s, uint8_t * const *samples) +static void apply_mdct(AC3EncodeContext *s) { av_assert1(s->num_blocks > 0); + uint8_t * const *samples = s->input_samples; for (int ch = 0; ch < s->channels; ch++) { const SampleType *input_samples0 = (const SampleType*)s->planar_samples[ch]; @@ -346,10 +347,30 @@ static void compute_rematrixing_strategy(AC3EncodeContext *s) } } - -static void encode_frame(AC3EncodeContext *s, uint8_t * const *samples) +/* + * Copy input samples. + */ +static void copy_input_samples(AC3EncodeContext *s, const AVFrame *frame) { - apply_mdct(s, samples); + int ch; + int end = frame ? frame->nb_samples : 0; + + for (ch = 0; ch < s->channels; ch++) { + /* copy new samples and zero any remaining samples */ + if (frame) { + memcpy(s->input_samples[ch], + frame->extended_data[ch], + frame->nb_samples * sizeof(SampleType)); + } + memset(&s->input_samples[ch][end], 0, + (s->avctx->frame_size - end) * sizeof(SampleType)); + } +} + +static void encode_frame(AC3EncodeContext *s, const AVFrame *frame) +{ + copy_input_samples(s, frame); + apply_mdct(s); s->cpl_on = s->cpl_enabled; ff_ac3_compute_coupling_strategy(s); diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index 10b1ab337c..7a678b518c 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -270,7 +270,8 @@ const FFCodec ff_eac3_encoder = { CODEC_LONG_NAME("ATSC A/52 E-AC-3"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_EAC3, - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | + AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, .priv_data_size = sizeof(AC3EncodeContext), .init = eac3_encode_init, FF_CODEC_ENCODE_CB(ff_ac3_encode_frame), diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index 9f655c3ff4..c0b10c68fb 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -68,18 +68,14 @@ $(FATE_AC3) $(FATE_EAC3): CMP = oneoff FATE_AC3-$(call PCM, AC3, AC3 AC3_FIXED, PCM_S16LE_MUXER ARESAMPLE_FILTER) += $(FATE_AC3) FATE_EAC3-$(call PCM, EAC3, EAC3, PCM_S16LE_MUXER ARESAMPLE_FILTER) += $(FATE_EAC3) -FATE_AC3-$(call ENCDEC, AC3, AC3, WAV_MUXER WAV_DEMUXER ARESAMPLE_FILTER PCM_S16LE_ENCODER PIPE_PROTOCOL) += fate-ac3-encode -fate-ac3-encode: CMD = enc_dec_pcm ac3 wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a ac3 -b:a 128k -fate-ac3-encode: CMP_SHIFT = -1024 -fate-ac3-encode: CMP_TARGET = 404.53 -fate-ac3-encode: SIZE_TOLERANCE = 488 +FATE_AC3-$(call ENCDEC, AC3, MP4 MOV, WAV_MUXER WAV_DEMUXER ARESAMPLE_FILTER PCM_S16LE_ENCODER PIPE_PROTOCOL) += fate-ac3-encode +fate-ac3-encode: CMD = enc_dec_pcm mp4 wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a ac3 -b:a 128k +fate-ac3-encode: CMP_TARGET = 410.25 -FATE_EAC3-$(call ENCDEC, EAC3, EAC3, WAV_MUXER WAV_DEMUXER ARESAMPLE_FILTER PCM_S16LE_ENCODER PIPE_PROTOCOL) += fate-eac3-encode -fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a eac3 -b:a 128k -fate-eac3-encode: CMP_SHIFT = -1024 -fate-eac3-encode: CMP_TARGET = 516.94 -fate-eac3-encode: SIZE_TOLERANCE = 488 +FATE_EAC3-$(call ENCDEC, EAC3, MP4 MOV, WAV_MUXER WAV_DEMUXER ARESAMPLE_FILTER PCM_S16LE_ENCODER PIPE_PROTOCOL) += fate-eac3-encode +fate-eac3-encode: CMD = enc_dec_pcm mp4 wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a eac3 -b:a 128k +fate-eac3-encode: CMP_TARGET = 520.69 fate-ac3-encode fate-eac3-encode: CMP = stddev fate-ac3-encode fate-eac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav @@ -89,7 +85,7 @@ fate-ac3-fixed-encode: tests/data/asynth-44100-2.wav fate-ac3-fixed-encode: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -ab 128k -f ac3 -flags +bitexact -af aresample fate-ac3-fixed-encode: CMP = oneline -fate-ac3-fixed-encode: REF = e9d78bca187b4bbafc4512bcea8efd3e +fate-ac3-fixed-encode: REF = 024170ce0147cbb9d6eda34b30b05935 # This tests that the LFE does not get lost when converting the input 7.1 # to a channel layout supported by the encoder. diff --git a/tests/ref/fate/ac3-fixed-encode-2 b/tests/ref/fate/ac3-fixed-encode-2 index 8e945b6637..468441cd7e 100644 --- a/tests/ref/fate/ac3-fixed-encode-2 +++ b/tests/ref/fate/ac3-fixed-encode-2 @@ -11,3 +11,4 @@ 0, 7424, 7424, 1536, 1114, 0xfbcc27ad 0, 8960, 8960, 1536, 1114, 0xe7ed3321 0, 10496, 10496, 1536, 1114, 0xa1823473 +0, 12032, 12032, 256, 1116, 0x7cc628e3, S=1, Skip Samples, 10, 0x00190005 diff --git a/tests/ref/fate/autorotate b/tests/ref/fate/autorotate index 1166bb63fc..34870592c8 100644 --- a/tests/ref/fate/autorotate +++ b/tests/ref/fate/autorotate @@ -1,4 +1,4 @@ -bb03affe94dfbe39c8cad8eb69dc367c *tests/data/fate/autorotate.mov +54cea6414b534ed2ee8c37c00988dabd *tests/data/fate/autorotate.mov 197366 tests/data/fate/autorotate.mov #extradata 0: 34, 0x9d7d073f #tb 0: 1/15360 diff --git a/tests/ref/fate/shortest b/tests/ref/fate/shortest index 3592b3f1f0..68d1038b71 100644 --- a/tests/ref/fate/shortest +++ b/tests/ref/fate/shortest @@ -115,3 +115,4 @@ 0, 48, 48, 1, 28143, 0x1df268c5, S=1, Quality stats, 8, 0x050000a1 1, 85760, 85760, 1536, 418, 0xae06ca91 0, 49, 49, 1, 10073, 0xedb9f031, F=0x0, S=1, Quality stats, 8, 0x050400a2 +1, 87296, 87296, 256, 418, 0x0a0bdddc, S=1, Skip Samples, 10, 0x00190005 diff --git a/tests/ref/fate/unknown_layout-ac3 b/tests/ref/fate/unknown_layout-ac3 index a694c52899..071541f2db 100644 --- a/tests/ref/fate/unknown_layout-ac3 +++ b/tests/ref/fate/unknown_layout-ac3 @@ -1 +1 @@ -ff7e25844b3cb6abb571ef7e226cbafa +15c6d7256fa03f0fdbf6e0e2376448c0 diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm index 62251380cf..cec7ec0725 100644 --- a/tests/ref/lavf/rm +++ b/tests/ref/lavf/rm @@ -1,2 +1,2 @@ -a7b0ac6e5131bbf662a07ccc82ab8618 *tests/data/lavf/lavf.rm +4ef2bdea6c0fbf4f71726e5a9e359415 *tests/data/lavf/lavf.rm 346424 tests/data/lavf/lavf.rm -- 2.52.0

1 0

[PR] avformat/mpegtsenc: add mpegts_pcr_pid option for separate PCR PID (PR #23650)
by shadowcaster3 29 Jun '26

29 Jun '26

PR #23650 opened by shadowcaster3 URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23650 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23650.patch # Summary of changes Add a new muxer option `mpegts_pcr_pid` that generates PCR on a dedicated adaptation-field-only PID, separate from any elementary stream. ISDB-T 1seg receivers require PCR on a standalone PID. When PCR shares the video PID, these receivers acquire the service but refuse to decode video and audio. This is standard practice in Japanese digital terrestrial broadcasting per ARIB TR-B14. When `mpegts_pcr_pid` is set to a non-zero value: - PCR packets are generated as adaptation-field-only packets on the specified PID at the interval set by `pcr_period` - The video stream adaptation fields do not carry PCR flags - The PMT PCR_PID field is set to the specified PID When `mpegts_pcr_pid` is 0 (default): existing behavior is unchanged. Example: ffmpeg -i input.mp4 -c:v libx264 -c:a aac -f mpegts \ -mpegts_pcr_pid 0x05FF -muxrate 416000 -pcr_period 40 output.ts Tested with a PSP 1seg TV tuner receiving over-the-air via gr-isdbt SDR transmitter. Video and audio decode correctly with separate PCR PID; without it the receiver refuses to decode. Fixes: https://code.ffmpeg.org/FFmpeg/FFmpeg/issues/23649 From b106635be51c7303a64a2e42de04f7a76f26a687 Mon Sep 17 00:00:00 2001 From: shadowcaster3 <vasyl.samoilov(a)gmail.com> Date: Tue, 30 Jun 2026 00:35:30 +0300 Subject: [PATCH] avformat/mpegtsenc: add mpegts_pcr_pid option for separate PCR PID Add a new muxer option mpegts_pcr_pid that generates PCR on a dedicated adaptation-field-only PID, separate from any elementary stream. ISDB-T 1seg receivers require PCR on a standalone PID. When PCR shares the video PID, these receivers acquire the service but refuse to decode video and audio. This is standard practice in Japanese digital terrestrial broadcasting per ARIB TR-B14. When mpegts_pcr_pid is set to a non-zero value: - PCR packets are generated as adaptation-field-only packets on the specified PID at the interval set by pcr_period - The video stream adaptation fields do not carry PCR flags - The PMT PCR_PID field is set to the specified PID When mpegts_pcr_pid is 0 (default): existing behavior is unchanged. Fixes: https://code.ffmpeg.org/FFmpeg/FFmpeg/issues/23649 Signed-off-by: shadowcaster3 <vasyl.samoilov(a)gmail.com> --- doc/muxers.texi | 8 +++++ libavformat/mpegtsenc.c | 74 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 9a579ebebf..93001b64c1 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -3170,6 +3170,14 @@ Override the default PCR retransmission time in milliseconds. Default is 20 ms is used for CBR streams, the highest multiple of the frame duration which is less than 100 ms is used for VBR streams. +@item mpegts_pcr_pid @var{integer} +Set a separate PID for PCR packets. When set to a non-zero value, PCR is +carried in adaptation-field-only packets on the specified PID instead of +being embedded in an elementary stream. The PMT PCR_PID field is set +accordingly. Default is @code{0} which means PCR is placed on the video +stream PID (existing behavior). This is required for ISDB-T 1seg receivers +which expect a dedicated PCR PID. + @item pat_period @var{duration} Maximum time in seconds between PAT/PMT tables. Default is @code{0.1}. diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 7f76883531..03d3012d60 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -132,6 +132,12 @@ typedef struct MpegTSWrite { uint8_t provider_name[256]; int omit_video_pes_length; + + int pcr_pid; ///< user-specified separate PCR PID (0 = use video PID) + int pcr_stream_pid; ///< actual PID used for dedicated PCR packets + int pcr_stream_cc; ///< continuity counter for dedicated PCR PID + int64_t pcr_stream_pcr_period; ///< PCR period for the dedicated stream + int64_t pcr_stream_last_pcr; ///< last PCR sent on the dedicated PID } MpegTSWrite; /* a PES packet header is generated every DEFAULT_PES_HEADER_FREQ packets */ @@ -1088,7 +1094,16 @@ static void select_pcr_streams(AVFormatContext *s) } } - if (pcr_st) { + if (ts->pcr_pid > 0) { + int pcr_period_ms = ts->pcr_period_ms == -1 ? PCR_RETRANS_TIME : ts->pcr_period_ms; + service->pcr_pid = ts->pcr_pid; + ts->pcr_stream_pid = ts->pcr_pid; + ts->pcr_stream_cc = 15; + ts->pcr_stream_pcr_period = av_rescale(pcr_period_ms, PCR_TIME_BASE, 1000); + ts->pcr_stream_last_pcr = ts->first_pcr - ts->pcr_stream_pcr_period; + av_log(s, AV_LOG_VERBOSE, "service %i using separate PCR pid=%d, pcr_period=%"PRId64"ms\n", + service->sid, ts->pcr_stream_pid, (int64_t)pcr_period_ms); + } else if (pcr_st) { MpegTSWriteStream *ts_st = pcr_st->priv_data; service->pcr_pid = ts_st->pid; enable_pcr_generation_for_stream(s, pcr_st); @@ -1406,6 +1421,30 @@ static void mpegts_insert_pcr_only(AVFormatContext *s, AVStream *st) write_packet(s, buf); } +/** Write a single transport stream packet with PCR on a dedicated PID. */ +static void mpegts_insert_pcr_only_pid(AVFormatContext *s) +{ + MpegTSWrite *ts = s->priv_data; + uint8_t *q; + uint8_t buf[TS_PACKET_SIZE]; + + q = buf; + *q++ = SYNC_BYTE; + *q++ = (ts->pcr_stream_pid >> 8) & 0x1f; + *q++ = ts->pcr_stream_pid & 0xff; + *q++ = 0x20 | (ts->pcr_stream_cc & 0xf); /* Adaptation only, no payload */ + /* Continuity Count field does not increment for adaptation-only (13818-1 section 2.4.3.3) */ + *q++ = TS_PACKET_SIZE - 5; /* Adaptation Field Length */ + *q++ = 0x10; /* Adaptation flags: PCR present */ + + /* PCR coded into 6 bytes */ + q += write_pcr_bits(q, get_pcr(ts)); + + /* stuffing bytes */ + memset(q, STUFFING_BYTE, TS_PACKET_SIZE - (q - buf)); + write_packet(s, buf); +} + static void write_pts(uint8_t *q, int fourbits, int64_t pts) { int val; @@ -1534,7 +1573,15 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, if (ts->mux_rate > 1) { /* Send PCR packets for all PCR streams if needed */ pcr = get_pcr(ts); - if (pcr >= ts->next_pcr) { + if (ts->pcr_pid > 0) { + /* Dedicated PCR PID: send adaptation-only packets on that PID */ + if (pcr - ts->pcr_stream_last_pcr >= ts->pcr_stream_pcr_period) { + ts->pcr_stream_last_pcr = FFMAX(pcr - ts->pcr_stream_pcr_period, ts->pcr_stream_last_pcr + ts->pcr_stream_pcr_period); + mpegts_insert_pcr_only_pid(s); + pcr = get_pcr(ts); + } + ts->next_pcr = ts->pcr_stream_last_pcr + ts->pcr_stream_pcr_period; + } else if (pcr >= ts->next_pcr) { int64_t next_pcr = INT64_MAX; for (int i = 0; i < s->nb_streams; i++) { /* Make the current stream the last, because for that we @@ -1559,13 +1606,28 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, } if (dts != AV_NOPTS_VALUE && (dts - pcr / SYSTEM_CLOCK_FREQUENCY_DIVISOR) > delay) { /* pcr insert gets priority over null packet insert */ - if (write_pcr) + if (ts->pcr_pid > 0) { + int64_t cur_pcr = get_pcr(ts); + if (cur_pcr - ts->pcr_stream_last_pcr >= ts->pcr_stream_pcr_period) { + ts->pcr_stream_last_pcr = FFMAX(cur_pcr - ts->pcr_stream_pcr_period, ts->pcr_stream_last_pcr + ts->pcr_stream_pcr_period); + mpegts_insert_pcr_only_pid(s); + } else { + mpegts_insert_null_packet(s); + } + } else if (write_pcr) { mpegts_insert_pcr_only(s, st); - else + } else { mpegts_insert_null_packet(s); + } /* recalculate write_pcr and possibly retransmit si_info */ continue; } + } else if (ts->pcr_pid > 0 && pcr != AV_NOPTS_VALUE) { + /* VBR mode with dedicated PCR PID */ + if (pcr - ts->pcr_stream_last_pcr >= ts->pcr_stream_pcr_period && is_start) { + ts->pcr_stream_last_pcr = FFMAX(pcr - ts->pcr_stream_pcr_period, ts->pcr_stream_last_pcr + ts->pcr_stream_pcr_period); + mpegts_insert_pcr_only_pid(s); + } } else if (ts_st->pcr_period && pcr != AV_NOPTS_VALUE) { if (pcr - ts_st->last_pcr >= ts_st->pcr_period && is_start) { ts_st->last_pcr = FFMAX(pcr - ts_st->pcr_period, ts_st->last_pcr + ts_st->pcr_period); @@ -1594,7 +1656,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, key && is_start && pts != AV_NOPTS_VALUE && !is_dvb_teletext /* adaptation+payload forbidden for teletext (ETSI EN 300 472 V1.3.1 4.1) */) { // set Random Access for key frames - if (ts_st->pcr_period) + if (ts_st->pcr_period && !ts->pcr_pid) write_pcr = 1; set_af_flag(buf, 0x40); q = get_ts_payload_start(buf); @@ -2389,6 +2451,8 @@ static const AVOption options[] = { OFFSET(omit_video_pes_length), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, ENC }, { "pcr_period", "PCR retransmission time in milliseconds", OFFSET(pcr_period_ms), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, ENC }, + { "mpegts_pcr_pid", "Set a separate PCR PID (0 means PCR on video PID)", + OFFSET(pcr_pid), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0x1FFF, ENC }, { "pat_period", "PAT/PMT retransmission time limit in seconds", OFFSET(pat_period_us), AV_OPT_TYPE_DURATION, { .i64 = PAT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, ENC }, { "sdt_period", "SDT retransmission time limit in seconds", -- 2.52.0

1 0

[PR] avformat/movenc: free sgpd_entries on the roll-distance error path (PR #23648)
by michaelni 29 Jun '26

29 Jun '26

PR #23648 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23648 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23648.patch Found-by: Ao Xijie Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> From f93e65b01ed394545433a0af873912d974158f43 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Mon, 29 Jun 2026 01:35:05 +0200 Subject: [PATCH] avformat/movenc: free sgpd_entries on the roll-distance error path Found-by: Ao Xijie Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/movenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index c14f05ecc8..66752f35dc 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3345,8 +3345,10 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track) if (roll_samples_remaining > 0) distance = 0; /* Verify distance is a maximum of 32 (2.5ms) packets. */ - if (distance > 32) + if (distance > 32) { + av_freep(&sgpd_entries); return AVERROR_INVALIDDATA; + } if (i && distance == sgpd_entries[entries].roll_distance) { sgpd_entries[entries].count++; } else { -- 2.52.0

1 0

[PR] avfilter/vf_removelogo: free the whole mask on allocation failure (PR #23647)
by michaelni 29 Jun '26

29 Jun '26

PR #23647 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23647 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23647.patch Found-by: Ao Xijie Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> From 54d4abb2a9aaab67f020ebae0702cfdf08961296 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Mon, 29 Jun 2026 01:35:05 +0200 Subject: [PATCH] avfilter/vf_removelogo: free the whole mask on allocation failure Found-by: Ao Xijie Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavfilter/vf_removelogo.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_removelogo.c b/libavfilter/vf_removelogo.c index 1da5f5d0c7..7285f5336a 100644 --- a/libavfilter/vf_removelogo.c +++ b/libavfilter/vf_removelogo.c @@ -311,22 +311,18 @@ static av_cold int init(AVFilterContext *ctx) the filter is applied, the mask size is determined on a pixel by pixel basis, with pixels nearer the edge of the logo getting smaller mask sizes. */ - mask = (int ***)av_malloc_array(s->max_mask_size + 1, sizeof(int **)); + mask = av_calloc(s->max_mask_size + 1, sizeof(*mask)); if (!mask) return AVERROR(ENOMEM); for (a = 0; a <= s->max_mask_size; a++) { - mask[a] = (int **)av_malloc_array((a * 2) + 1, sizeof(int *)); - if (!mask[a]) { - av_free(mask); - return AVERROR(ENOMEM); - } + mask[a] = av_calloc((a * 2) + 1, sizeof(*mask[a])); + if (!mask[a]) + goto mask_fail; for (b = -a; b <= a; b++) { - mask[a][b + a] = (int *)av_malloc_array((a * 2) + 1, sizeof(int)); - if (!mask[a][b + a]) { - av_free(mask); - return AVERROR(ENOMEM); - } + mask[a][b + a] = av_malloc_array((a * 2) + 1, sizeof(*mask[a][b + a])); + if (!mask[a][b + a]) + goto mask_fail; for (c = -a; c <= a; c++) { if ((b * b) + (c * c) <= (a * a)) /* Circular 0/1 mask. */ mask[a][b + a][c + a] = 1; @@ -351,6 +347,16 @@ static av_cold int init(AVFilterContext *ctx) SHOW_LOGO_INFO(half); return 0; + +mask_fail: + for (a = 0; a <= s->max_mask_size; a++) { + if (mask[a]) + for (b = 0; b < (a * 2) + 1; b++) + av_free(mask[a][b]); + av_free(mask[a]); + } + av_free(mask); + return AVERROR(ENOMEM); } static int config_props_input(AVFilterLink *inlink) -- 2.52.0

1 0

[PR] avfilter/af_adeclick: free transform contexts and buffers on error (PR #23646)
by michaelni 29 Jun '26

29 Jun '26

PR #23646 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23646 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23646.patch Found-by: Ao Xijie Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> From 7d6ba3101005f87a51ecdf41a76d433519465d73 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Mon, 29 Jun 2026 01:35:05 +0200 Subject: [PATCH] avfilter/af_adeclick: free transform contexts and buffers on error Found-by: Ao Xijie Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavfilter/af_adeclick.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libavfilter/af_adeclick.c b/libavfilter/af_adeclick.c index 043435b186..198e7fab63 100644 --- a/libavfilter/af_adeclick.c +++ b/libavfilter/af_adeclick.c @@ -130,8 +130,8 @@ static int config_input(AVFilterLink *inlink) return AVERROR(ENOMEM); { - double *tx_in[2], *tx_out[2]; - AVTXContext *tx, *itx; + double *tx_in[2] = { NULL }, *tx_out[2] = { NULL }; + AVTXContext *tx = NULL, *itx = NULL; av_tx_fn tx_fn, itx_fn; int ret, tx_size; double scale; @@ -141,19 +141,21 @@ static int config_input(AVFilterLink *inlink) scale = 1.0; ret = av_tx_init(&tx, &tx_fn, AV_TX_DOUBLE_RDFT, 0, tx_size, &scale, 0); if (ret < 0) - return ret; + goto tx_end; scale = 1.0 / tx_size; ret = av_tx_init(&itx, &itx_fn, AV_TX_DOUBLE_RDFT, 1, tx_size, &scale, 0); if (ret < 0) - return ret; + goto tx_end; tx_in[0] = av_calloc(tx_size + 2, sizeof(*tx_in[0])); tx_in[1] = av_calloc(tx_size + 2, sizeof(*tx_in[1])); tx_out[0] = av_calloc(tx_size + 2, sizeof(*tx_out[0])); tx_out[1] = av_calloc(tx_size + 2, sizeof(*tx_out[1])); - if (!tx_in[0] || !tx_in[1] || !tx_out[0] || !tx_out[1]) - return AVERROR(ENOMEM); + if (!tx_in[0] || !tx_in[1] || !tx_out[0] || !tx_out[1]) { + ret = AVERROR(ENOMEM); + goto tx_end; + } for (int n = 0; n < s->window_size - s->hop_size; n++) tx_in[0][n] = 1.0; @@ -180,6 +182,7 @@ static int config_input(AVFilterLink *inlink) for (int n = 0; n < s->window_size; n++) s->window_func_lut[n] = tx_out[0][n] * scale; +tx_end: av_tx_uninit(&tx); av_tx_uninit(&itx); @@ -187,6 +190,9 @@ static int config_input(AVFilterLink *inlink) av_freep(&tx_in[1]); av_freep(&tx_out[0]); av_freep(&tx_out[1]); + + if (ret < 0) + return ret; } av_frame_free(&s->in); -- 2.52.0

1 0

[PR] tests: Implicitly set TAG=GEN for data/*.m3u8 (PR #23645)
by Martin Storsjö 29 Jun '26

29 Jun '26

PR #23645 opened by Martin Storsjö (mstorsjo) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23645 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23645.patch This avoids having to declare it for every rule that generates test input data, and adds such a missing tag for tests/data/hls-seek.m3u8. This fixes a case of a missing TAG for data/hls-seek.m3u8, which caused it to be printed without a tag, like " tests/data/hls-seek.m3u8", now printed as "GEN tests/data/hls-seek.m3u8" as expected. # Summary of changes Briefly describe what this PR does and why.  From 92007e290f7524a739449cad0c55a3dcab917f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> Date: Mon, 29 Jun 2026 10:44:22 +0300 Subject: [PATCH] tests: Implicitly set TAG=GEN for data/*.m3u8 This avoids having to declare it for every rule that generates test input data, and adds such a missing tag for tests/data/hls-seek.m3u8. This fixes a case of a missing TAG for data/hls-seek.m3u8, which caused it to be printed without a tag, like " tests/data/hls-seek.m3u8", now printed as "GEN tests/data/hls-seek.m3u8" as expected. --- tests/Makefile | 2 +- tests/fate/filter-audio.mak | 2 -- tests/fate/hlsenc.mak | 19 ------------------- tests/fate/segment.mak | 2 -- 4 files changed, 1 insertion(+), 24 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 8c7d4539a3..3f0132dd97 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -51,7 +51,7 @@ tests/test_copy.ffmeta: TAG = COPY tests/test_copy.ffmeta: tests/data $(M)cp -f $(SRC_PATH)/tests/test.ffmeta tests/test_copy.ffmeta -tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut: TAG = GEN +tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut tests/data/%.m3u8: TAG = GEN tests/data/filtergraphs/%: TAG = COPY tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 526645a634..7817548037 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -214,7 +214,6 @@ fate-filter-compand: tests/data/filtergraphs/compand fate-filter-compand: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-filter-compand: CMD = framecrc -auto_conversion_filters -i $(SRC) -frames:a 20 -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/compand -tests/data/hls-list.m3u8: TAG = GEN tests/data/hls-list.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f segment -segment_time 10 -map 0 -flags +bitexact -codec:a mp2fixed \ @@ -224,7 +223,6 @@ FATE_AFILTER-$(call FILTERDEMDECENCMUX, ARESAMPLE AEVALSRC, HLS MPEGTS, MP2 PCM_ fate-filter-hls: tests/data/hls-list.m3u8 fate-filter-hls: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls-list.m3u8 -af aresample -tests/data/hls-list-append.m3u8: TAG = GEN tests/data/hls-list-append.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f segment -segment_time 10 -map 0 -flags +bitexact -codec:a mp2fixed \ diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak index cd6cd60365..1ddb927cae 100644 --- a/tests/fate/hlsenc.mak +++ b/tests/fate/hlsenc.mak @@ -1,4 +1,3 @@ -tests/data/live_no_endlist.m3u8: TAG = GEN tests/data/live_no_endlist.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -v verbose -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 3 -map 0 \ @@ -12,7 +11,6 @@ fate-hls-live-no-endlist: CMD = md5 -i $(SRC) -af hdcd=process_stereo=false -t 6 fate-hls-live-no-endlist: CMP = oneline fate-hls-live-no-endlist: REF = e038bb8e65d4c1745b9b3ed643e607a3 -tests/data/event_no_endlist.m3u8: TAG = GEN tests/data/event_no_endlist.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -v verbose -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 3 -map 0 \ @@ -27,7 +25,6 @@ fate-hls-event-no-endlist: CMD = md5 -ss 3 -i $(SRC) -af hdcd=process_stereo=fal fate-hls-event-no-endlist: CMP = oneline fate-hls-event-no-endlist: REF = d9cd56b6aaebf67a52a63dd44ec5b085 -tests/data/live_last_endlist.m3u8: TAG = GEN tests/data/live_last_endlist.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -v verbose -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 3 -map 0 \ @@ -42,7 +39,6 @@ fate-hls-live-last-endlist: CMP = oneline fate-hls-live-last-endlist: REF = 2ca8567092dcf01e37bedd50454d1ab7 -tests/data/live_endlist.m3u8: TAG = GEN tests/data/live_endlist.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 3 -map 0 \ @@ -56,7 +52,6 @@ fate-hls-live-endlist: CMD = md5 -i $(SRC) -af hdcd=process_stereo=false -t 20 - fate-hls-live-endlist: CMP = oneline fate-hls-live-endlist: REF = e189ce781d9c87882f58e3929455167b -tests/data/hls_segment_size.m3u8: TAG = GEN tests/data/hls_segment_size.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_segment_size 300000 -map 0 \ @@ -67,7 +62,6 @@ FATE_HLSENC-$(call FILTERDEMDECENCMUX, AEVALSRC ARESAMPLE, HLS MPEGTS, MP2 PCM_F fate-hls-segment-size: tests/data/hls_segment_size.m3u8 fate-hls-segment-size: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_segment_size.m3u8 -vf setpts=N*23 -tests/data/hls_segment_single.m3u8: TAG = GEN tests/data/hls_segment_single.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_flags single_file -map 0 \ @@ -78,7 +72,6 @@ FATE_HLSENC-$(call FILTERDEMDECENCMUX, AEVALSRC ARESAMPLE, HLS MPEGTS, MP2 PCM_F fate-hls-segment-single: tests/data/hls_segment_single.m3u8 fate-hls-segment-single: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_segment_single.m3u8 -vf setpts=N*23 -tests/data/hls_init_time.m3u8: TAG = GEN tests/data/hls_init_time.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=11" -f hls -hls_init_time 1 -hls_time 3 -map 0 \ @@ -89,7 +82,6 @@ FATE_HLSENC-$(call FILTERDEMDECENCMUX, AEVALSRC ARESAMPLE, HLS MPEGTS, MP2 PCM_F fate-hls-init-time: tests/data/hls_init_time.m3u8 fate-hls-init-time: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_init_time.m3u8 -vf setpts=N*23 -tests/data/hls_list_size.m3u8: TAG = GEN tests/data/hls_list_size.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 4 -map 0 \ @@ -100,7 +92,6 @@ FATE_HLSENC-$(call FILTERDEMDECENCMUX, AEVALSRC ARESAMPLE, HLS MPEGTS, MP2 PCM_F fate-hls-list-size: tests/data/hls_list_size.m3u8 fate-hls-list-size: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_list_size.m3u8 -vf setpts=N*23 -tests/data/hls_fmp4.m3u8: TAG = GEN tests/data/hls_fmp4.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -re -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=5" -map 0 -codec:a mp2fixed \ @@ -112,7 +103,6 @@ FATE_HLSENC-$(call FILTERDEMDECENCMUX, AEVALSRC ARESAMPLE, HLS MPEGTS, MP2 PCM_F fate-hls-fmp4: tests/data/hls_fmp4.m3u8 fate-hls-fmp4: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_fmp4.m3u8 -vf setpts=N*23 -tests/data/hls_fmp4_ac3.m3u8: TAG = GEN tests/data/hls_fmp4_ac3.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -stream_loop 4 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 -c copy -map 0 \ @@ -127,7 +117,6 @@ fate-hls-fmp4_ac3: tests/data/hls_fmp4_ac3.m3u8 fate-hls-fmp4_ac3: CMD = probeaudiostream $(TARGET_PATH)/tests/data/now_ac3.mp4 -tests/data/hls_cmfa.m3u8: TAG = GEN tests/data/hls_cmfa.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -i $(TARGET_SAMPLES)/aac/al06_44.mp4 -c copy -map 0 \ @@ -146,7 +135,6 @@ FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_HLSENC_PROBE-yes) # -- Tests below do not require FATE samples (lavfi-generated input only) -- -tests/data/hls_playlist_type_vod.m3u8: TAG = GEN tests/data/hls_playlist_type_vod.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -159,7 +147,6 @@ fate-hls-playlist-type-vod: tests/data/hls_playlist_type_vod.m3u8 fate-hls-playlist-type-vod: CMD = sed -n -e /^\#EXT-X-PLAYLIST-TYPE:/p -e /^\#EXT-X-ENDLIST/p $(TARGET_PATH)/tests/data/hls_playlist_type_vod.m3u8 fate-hls-playlist-type-vod: CMP = diff -tests/data/hls_playlist_type_event.m3u8: TAG = GEN tests/data/hls_playlist_type_event.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -172,7 +159,6 @@ fate-hls-playlist-type-event: tests/data/hls_playlist_type_event.m3u8 fate-hls-playlist-type-event: CMD = sed -n -e /^\#EXT-X-PLAYLIST-TYPE:/p -e /^\#EXT-X-ENDLIST/p $(TARGET_PATH)/tests/data/hls_playlist_type_event.m3u8 fate-hls-playlist-type-event: CMP = diff -tests/data/hls_round_durations.m3u8: TAG = GEN tests/data/hls_round_durations.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -185,7 +171,6 @@ fate-hls-round-durations: tests/data/hls_round_durations.m3u8 fate-hls-round-durations: CMD = sed -n -e /^\#EXTINF:/p $(TARGET_PATH)/tests/data/hls_round_durations.m3u8 fate-hls-round-durations: CMP = diff -tests/data/hls_discont_start.m3u8: TAG = GEN tests/data/hls_discont_start.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -198,7 +183,6 @@ fate-hls-discont-start: tests/data/hls_discont_start.m3u8 fate-hls-discont-start: CMD = sed -n -e /^\#EXT-X-DISCONTINUITY/p -e /^\#EXTINF:/p -e /^[^\#]/p $(TARGET_PATH)/tests/data/hls_discont_start.m3u8 fate-hls-discont-start: CMP = diff -tests/data/hls_independent_segments.m3u8: TAG = GEN tests/data/hls_independent_segments.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -211,7 +195,6 @@ fate-hls-independent-segments: tests/data/hls_independent_segments.m3u8 fate-hls-independent-segments: CMD = sed -n -e /^\#EXT-X-INDEPENDENT-SEGMENTS/p $(TARGET_PATH)/tests/data/hls_independent_segments.m3u8 fate-hls-independent-segments: CMP = diff -tests/data/hls_start_number.m3u8: TAG = GEN tests/data/hls_start_number.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -224,7 +207,6 @@ fate-hls-start-number: tests/data/hls_start_number.m3u8 fate-hls-start-number: CMD = sed -n -e /^\#EXT-X-MEDIA-SEQUENCE:/p -e /^[^\#]/p $(TARGET_PATH)/tests/data/hls_start_number.m3u8 fate-hls-start-number: CMP = diff -tests/data/hls_iframes_single_mpegts.m3u8: TAG = GEN tests/data/hls_iframes_single_mpegts.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -238,7 +220,6 @@ fate-hls-iframes-single-mpegts: tests/data/hls_iframes_single_mpegts.m3u8 fate-hls-iframes-single-mpegts: CMD = sed -n -e /^\#EXT-X-BYTERANGE:/p $(TARGET_PATH)/tests/data/hls_iframes_single_mpegts.m3u8 fate-hls-iframes-single-mpegts: CMP = diff -tests/data/hls_iframes_single_fmp4.m3u8: TAG = GEN tests/data/hls_iframes_single_fmp4.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ diff --git a/tests/fate/segment.mak b/tests/fate/segment.mak index 8537462762..5803fffb98 100644 --- a/tests/fate/segment.mak +++ b/tests/fate/segment.mak @@ -1,11 +1,9 @@ -tests/data/mp4-to-ts.m3u8: TAG = GEN tests/data/mp4-to-ts.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 \ -f ssegment -segment_time 1 -map 0 -flags +bitexact -codec copy \ -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/mp4-to-ts-%03d.ts 2>/dev/null -tests/data/adts-to-mkv.m3u8: TAG = GEN tests/data/adts-to-mkv.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.m4a \ -- 2.52.0

1 0

[PATCH] avformat/mtv: validate computed frame rate
by albab-hasan 29 Jun '26

29 Jun '26

the frame rate is derived from audio_br and audio_subsegments via integer division. if audio_br is small enough that the result truncates to zero, avpriv_set_pts_info() silently ignores the call, leaving the video stream with an invalid timebase. --- libavformat/mtv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/mtv.c b/libavformat/mtv.c index c888443b7a..10be0faf7e 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -155,8 +155,10 @@ static int mtv_read_header(AVFormatContext *s) audio_subsegments * (MTV_AUDIO_PADDING_SIZE + MTV_ASUBCHUNK_DATA_SIZE) + mtv->img_segment_size; mtv->video_fps = (mtv->audio_br / 4) / audio_subsegments; - - // FIXME Add sanity check here + if (!mtv->video_fps) { + av_log(s, AV_LOG_ERROR, "Invalid frame rate\n"); + return AVERROR_INVALIDDATA; + } // all systems go! init decoders -- 2.43.0

1 0