December 2025 - ffmpeg-cvslog

[ffmpeg] branch master updated. f7551e7505 avcodec: fix checkasm-hpeldsp failed on LA
by ffmpeg-git＠ffmpeg.org 03 Dec '25

03 Dec '25

The branch, master has been updated via f7551e7505d389fcc14a8e16bcd13ab770658990 (commit) from 413346bd06c33226254dacc829f128a6b6c337d7 (commit) - Log ----------------------------------------------------------------- commit f7551e7505d389fcc14a8e16bcd13ab770658990 Author: yuanhecai <yuanhecai(a)loongson.cn> AuthorDate: Mon Nov 17 17:32:53 2025 +0800 Commit: HecaiYuan <yhc_1995(a)126.com> CommitDate: Wed Dec 3 01:36:01 2025 +0000 avcodec: fix checkasm-hpeldsp failed on LA diff --git a/libavcodec/loongarch/hpeldsp_init_loongarch.c b/libavcodec/loongarch/hpeldsp_init_loongarch.c index 1690be5438..ffdfb69bba 100644 --- a/libavcodec/loongarch/hpeldsp_init_loongarch.c +++ b/libavcodec/loongarch/hpeldsp_init_loongarch.c @@ -45,6 +45,6 @@ void ff_hpeldsp_init_loongarch(HpelDSPContext *c, int flags) c->put_no_rnd_pixels_tab[1][0] = ff_put_pixels8_8_lasx; c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_8_lasx; c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_8_lasx; - c->put_no_rnd_pixels_tab[1][3] = ff_put_no_rnd_pixels8_xy2_8_lasx; + c->put_no_rnd_pixels_tab[1][3] = ff_put_no_rnd_pixels8_xy2_8_lsx; } } diff --git a/libavcodec/loongarch/hpeldsp_lasx.c b/libavcodec/loongarch/hpeldsp_lasx.c index dd2ae173da..68cab715b9 100644 --- a/libavcodec/loongarch/hpeldsp_lasx.c +++ b/libavcodec/loongarch/hpeldsp_lasx.c @@ -192,61 +192,33 @@ void ff_put_pixels8_8_lasx(uint8_t *block, const uint8_t *pixels, ); } +/** + * For widths 16, h is always a positive multiple of 4. + * The function processes 4 rows per iteration. + */ void ff_put_pixels16_8_lsx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { - int h_8 = h >> 3; - int res = h & 7; - ptrdiff_t stride2, stride3, stride4; - - __asm__ volatile ( - "beqz %[h_8], 2f \n\t" - "slli.d %[stride2], %[stride], 1 \n\t" - "add.d %[stride3], %[stride2], %[stride] \n\t" - "slli.d %[stride4], %[stride2], 1 \n\t" - "1: \n\t" - "vld $vr0, %[src], 0x0 \n\t" - "vldx $vr1, %[src], %[stride] \n\t" - "vldx $vr2, %[src], %[stride2] \n\t" - "vldx $vr3, %[src], %[stride3] \n\t" - "add.d %[src], %[src], %[stride4] \n\t" - "vld $vr4, %[src], 0x0 \n\t" - "vldx $vr5, %[src], %[stride] \n\t" - "vldx $vr6, %[src], %[stride2] \n\t" - "vldx $vr7, %[src], %[stride3] \n\t" - "add.d %[src], %[src], %[stride4] \n\t" - - "addi.d %[h_8], %[h_8], -1 \n\t" - - "vst $vr0, %[dst], 0x0 \n\t" - "vstx $vr1, %[dst], %[stride] \n\t" - "vstx $vr2, %[dst], %[stride2] \n\t" - "vstx $vr3, %[dst], %[stride3] \n\t" - "add.d %[dst], %[dst], %[stride4] \n\t" - "vst $vr4, %[dst], 0x0 \n\t" - "vstx $vr5, %[dst], %[stride] \n\t" - "vstx $vr6, %[dst], %[stride2] \n\t" - "vstx $vr7, %[dst], %[stride3] \n\t" - "add.d %[dst], %[dst], %[stride4] \n\t" - "bnez %[h_8], 1b \n\t" - - "2: \n\t" - "beqz %[res], 4f \n\t" - "3: \n\t" - "vld $vr0, %[src], 0x0 \n\t" - "add.d %[src], %[src], %[stride] \n\t" - "addi.d %[res], %[res], -1 \n\t" - "vst $vr0, %[dst], 0x0 \n\t" - "add.d %[dst], %[dst], %[stride] \n\t" - "bnez %[res], 3b \n\t" - "4: \n\t" - : [dst]"+&r"(block), [src]"+&r"(pixels), - [h_8]"+&r"(h_8), [res]"+&r"(res), - [stride2]"=&r"(stride2), [stride3]"=&r"(stride3), - [stride4]"=&r"(stride4) - : [stride]"r"(line_size) - : "memory" - ); + int h_4 = h >> 2; + ptrdiff_t stride2 = line_size << 1; + ptrdiff_t stride3 = stride2 + line_size; + ptrdiff_t stride4 = line_size << 2; + __m128i src0, src1, src2, src3; + + for (int i = 0; i < h_4; i++) { + src0 = __lsx_vld(pixels, 0); + src1 = __lsx_vldx(pixels, line_size); + src2 = __lsx_vldx(pixels, stride2); + src3 = __lsx_vldx(pixels, stride3); + + __lsx_vst(src0, block, 0); + __lsx_vstx(src1, block, line_size); + __lsx_vstx(src2, block, stride2); + __lsx_vstx(src3, block, stride3); + + pixels += stride4; + block += stride4; + } } void ff_put_pixels8_x2_8_lasx(uint8_t *block, const uint8_t *pixels, @@ -277,961 +249,253 @@ void ff_put_pixels16_y2_8_lasx(uint8_t *block, const uint8_t *pixels, line_size, line_size, h); } -static void common_hz_bil_no_rnd_16x16_lasx(const uint8_t *src, - int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t *_src = (uint8_t*)src; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += 1; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += (src_stride_4x -1); - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src3, src2, 0x20, src5, - src4, 0x20, src7, src6, 0x20, src0, src1, src2, src3); - src0 = __lasx_xvavg_bu(src0, src2); - src1 = __lasx_xvavg_bu(src1, src3); - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src0, dst, 0, 2); - __lasx_xvstelm_d(src0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 0); - __lasx_xvstelm_d(src1, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 2); - __lasx_xvstelm_d(src1, dst, 8, 3); - dst += dst_stride; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += 1; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += (src_stride_4x - 1); - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src3, src2, 0x20, src5, src4, - 0x20, src7, src6, 0x20, src0, src1, src2, src3); - src0 = __lasx_xvavg_bu(src0, src2); - src1 = __lasx_xvavg_bu(src1, src3); - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src0, dst, 0, 2); - __lasx_xvstelm_d(src0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 0); - __lasx_xvstelm_d(src1, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 2); - __lasx_xvstelm_d(src1, dst, 8, 3); - dst += dst_stride; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += 1; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += (src_stride_4x - 1); - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src3, src2, 0x20, src5, src4, - 0x20, src7, src6, 0x20, src0, src1, src2, src3); - src0 = __lasx_xvavg_bu(src0, src2); - src1 = __lasx_xvavg_bu(src1, src3); - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src0, dst, 0, 2); - __lasx_xvstelm_d(src0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 0); - __lasx_xvstelm_d(src1, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 2); - __lasx_xvstelm_d(src1, dst, 8, 3); - dst += dst_stride; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += 1; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src3, src2, 0x20, src5, src4, - 0x20, src7, src6, 0x20, src0, src1, src2, src3); - src0 = __lasx_xvavg_bu(src0, src2); - src1 = __lasx_xvavg_bu(src1, src3); - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src0, dst, 0, 2); - __lasx_xvstelm_d(src0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 0); - __lasx_xvstelm_d(src1, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 2); - __lasx_xvstelm_d(src1, dst, 8, 3); -} - -static void common_hz_bil_no_rnd_8x16_lasx(const uint8_t *src, - int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t* _src = (uint8_t*)src; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += 1; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += (src_stride_4x - 1); - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src3, src2, 0x20, src5, src4, - 0x20, src7, src6, 0x20, src0, src1, src2, src3); - src0 = __lasx_xvavg_bu(src0, src2); - src1 = __lasx_xvavg_bu(src1, src3); - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src0, dst, 0, 2); - __lasx_xvstelm_d(src0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 0); - __lasx_xvstelm_d(src1, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 2); - __lasx_xvstelm_d(src1, dst, 8, 3); - dst += dst_stride; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += 1; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src3, src2, 0x20, src5, src4, - 0x20, src7, src6, 0x20, src0, src1, src2, src3); - src0 = __lasx_xvavg_bu(src0, src2); - src1 = __lasx_xvavg_bu(src1, src3); - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src0, dst, 0, 2); - __lasx_xvstelm_d(src0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 0); - __lasx_xvstelm_d(src1, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src1, dst, 0, 2); - __lasx_xvstelm_d(src1, dst, 8, 3); -} - +/** + * For widths 16, h is always a positive multiple of 4. + * The function processes 4 rows per iteration. + */ void ff_put_no_rnd_pixels16_x2_8_lasx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { - if (h == 16) { - common_hz_bil_no_rnd_16x16_lasx(pixels, line_size, block, line_size); - } else if (h == 8) { - common_hz_bil_no_rnd_8x16_lasx(pixels, line_size, block, line_size); + __m256i src0, src1, src2, src3, src4, src5, src6, src7; + int32_t h_4 = h >> 2; + int32_t stride2x = line_size << 1; + int32_t stride4x = line_size << 2; + int32_t stride3x = stride2x + line_size; + uint8_t* _src = (uint8_t*)pixels + 1; + + for (int i = 0; i < h_4; i++) { + src0 = __lasx_xvld(pixels, 0); + DUP2_ARG2(__lasx_xvldx, pixels, line_size, pixels, stride2x, src1, src2); + src3 = __lasx_xvldx(pixels, stride3x); + src4 = __lasx_xvld(_src, 0); + DUP2_ARG2(__lasx_xvldx, _src, line_size, _src, stride2x, src5, src6); + src7 = __lasx_xvldx(_src, stride3x); + DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src3, src2, 0x20, src5, src4, + 0x20, src7, src6, 0x20, src0, src1, src2, src3); + src0 = __lasx_xvavg_bu(src0, src2); + src1 = __lasx_xvavg_bu(src1, src3); + __lasx_xvstelm_d(src0, block, 0, 0); + __lasx_xvstelm_d(src0, block, 8, 1); + block += line_size; + __lasx_xvstelm_d(src0, block, 0, 2); + __lasx_xvstelm_d(src0, block, 8, 3); + block += line_size; + __lasx_xvstelm_d(src1, block, 0, 0); + __lasx_xvstelm_d(src1, block, 8, 1); + block += line_size; + __lasx_xvstelm_d(src1, block, 0, 2); + __lasx_xvstelm_d(src1, block, 8, 3); + block += line_size; + + _src += stride4x; + pixels += stride4x; } } -static void common_vt_bil_no_rnd_16x16_lasx(const uint8_t *src, - int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7, src8; - __m256i src9, src10, src11, src12, src13, src14, src15, src16; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t* _src = (uint8_t*)src; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src8 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src9, src10); - src11 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src12 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src13, src14); - src15 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src16 = __lasx_xvld(_src, 0); - - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src2, src1, 0x20, src3, src2, - 0x20, src4, src3, 0x20, src0, src1, src2, src3); - DUP4_ARG3(__lasx_xvpermi_q, src5, src4, 0x20, src6, src5, 0x20, src7, src6, - 0x20, src8, src7, 0x20, src4, src5, src6, src7); - DUP4_ARG3(__lasx_xvpermi_q, src9, src8, 0x20, src10, src9, 0x20, src11, - src10, 0x20, src12, src11, 0x20, src8, src9, src10, src11); - DUP4_ARG3(__lasx_xvpermi_q, src13, src12, 0x20, src14, src13, 0x20, src15, - src14, 0x20, src16, src15, 0x20, src12, src13, src14, src15); - DUP4_ARG2(__lasx_xvavg_bu, src0, src1, src2, src3, src4, src5, src6, src7, - src0, src2, src4, src6); - DUP4_ARG2(__lasx_xvavg_bu, src8, src9, src10, src11, src12, src13, src14, - src15, src8, src10, src12, src14); - - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src0, dst, 0, 2); - __lasx_xvstelm_d(src0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src2, dst, 0, 0); - __lasx_xvstelm_d(src2, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src2, dst, 0, 2); - __lasx_xvstelm_d(src2, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src4, dst, 0, 0); - __lasx_xvstelm_d(src4, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src4, dst, 0, 2); - __lasx_xvstelm_d(src4, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src6, dst, 0, 0); - __lasx_xvstelm_d(src6, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src6, dst, 0, 2); - __lasx_xvstelm_d(src6, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src8, dst, 0, 0); - __lasx_xvstelm_d(src8, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src8, dst, 0, 2); - __lasx_xvstelm_d(src8, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src10, dst, 0, 0); - __lasx_xvstelm_d(src10, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src10, dst, 0, 2); - __lasx_xvstelm_d(src10, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src12, dst, 0, 0); - __lasx_xvstelm_d(src12, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src12, dst, 0, 2); - __lasx_xvstelm_d(src12, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src14, dst, 0, 0); - __lasx_xvstelm_d(src14, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src14, dst, 0, 2); - __lasx_xvstelm_d(src14, dst, 8, 3); -} - -static void common_vt_bil_no_rnd_8x16_lasx(const uint8_t *src, - int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7, src8; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t* _src = (uint8_t*)src; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src8 = __lasx_xvld(_src, 0); - - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src2, src1, 0x20, src3, src2, - 0x20, src4, src3, 0x20, src0, src1, src2, src3); - DUP4_ARG3(__lasx_xvpermi_q, src5, src4, 0x20, src6, src5, 0x20, src7, src6, - 0x20, src8, src7, 0x20, src4, src5, src6, src7); - DUP4_ARG2(__lasx_xvavg_bu, src0, src1, src2, src3, src4, src5, src6, src7, - src0, src2, src4, src6); - - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src0, dst, 0, 2); - __lasx_xvstelm_d(src0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src2, dst, 0, 0); - __lasx_xvstelm_d(src2, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src2, dst, 0, 2); - __lasx_xvstelm_d(src2, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src4, dst, 0, 0); - __lasx_xvstelm_d(src4, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src4, dst, 0, 2); - __lasx_xvstelm_d(src4, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(src6, dst, 0, 0); - __lasx_xvstelm_d(src6, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(src6, dst, 0, 2); - __lasx_xvstelm_d(src6, dst, 8, 3); -} - +/** + * For widths 16, h is always a positive multiple of 4. + * The function processes 4 rows per iteration. + */ void ff_put_no_rnd_pixels16_y2_8_lasx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { - if (h == 16) { - common_vt_bil_no_rnd_16x16_lasx(pixels, line_size, block, line_size); - } else if (h == 8) { - common_vt_bil_no_rnd_8x16_lasx(pixels, line_size, block, line_size); - } -} - -static void common_hv_bil_no_rnd_16x16_lasx(const uint8_t *src, - int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7, src8, src9; - __m256i src10, src11, src12, src13, src14, src15, src16, src17; - __m256i sum0, sum1, sum2, sum3, sum4, sum5, sum6, sum7; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t* _src = (uint8_t*)src; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += (1 - src_stride_4x); - src9 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src10, src11); - src12 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src13 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src14, src15); - src16 = __lasx_xvldx(_src, src_stride_3x); - _src += (src_stride_4x - 1); - DUP2_ARG2(__lasx_xvld, _src, 0, _src, 1, src8, src17); - - DUP4_ARG3(__lasx_xvpermi_q, src0, src4, 0x02, src1, src5, 0x02, src2, - src6, 0x02, src3, src7, 0x02, src0, src1, src2, src3); - DUP4_ARG3(__lasx_xvpermi_q, src4, src8, 0x02, src9, src13, 0x02, src10, - src14, 0x02, src11, src15, 0x02, src4, src5, src6, src7); - DUP2_ARG3(__lasx_xvpermi_q, src12, src16, 0x02, src13, src17, 0x02, - src8, src9); - DUP4_ARG2(__lasx_xvilvl_h, src5, src0, src6, src1, src7, src2, src8, src3, - sum0, sum2, sum4, sum6); - DUP4_ARG2(__lasx_xvilvh_h, src5, src0, src6, src1, src7, src2, src8, src3, - sum1, sum3, sum5, sum7); - src8 = __lasx_xvilvl_h(src9, src4); - src9 = __lasx_xvilvh_h(src9, src4); - - DUP4_ARG2(__lasx_xvhaddw_hu_bu, sum0, sum0, sum1, sum1, sum2, sum2, - sum3, sum3, src0, src1, src2, src3); - DUP4_ARG2(__lasx_xvhaddw_hu_bu, sum4, sum4, sum5, sum5, sum6, sum6, - sum7, sum7, src4, src5, src6, src7); - DUP2_ARG2(__lasx_xvhaddw_hu_bu, src8, src8, src9, src9, src8, src9); - - DUP4_ARG2(__lasx_xvadd_h, src0, src2, src1, src3, src2, src4, src3, src5, - sum0, sum1, sum2, sum3); - DUP4_ARG2(__lasx_xvadd_h, src4, src6, src5, src7, src6, src8, src7, src9, - sum4, sum5, sum6, sum7); - DUP4_ARG2(__lasx_xvaddi_hu, sum0, 1, sum1, 1, sum2, 1, sum3, 1, - sum0, sum1, sum2, sum3); - DUP4_ARG2(__lasx_xvaddi_hu, sum4, 1, sum5, 1, sum6, 1, sum7, 1, - sum4, sum5, sum6, sum7); - DUP4_ARG3(__lasx_xvsrani_b_h, sum1, sum0, 2, sum3, sum2, 2, sum5, sum4, 2, - sum7, sum6, 2, sum0, sum1, sum2, sum3); - __lasx_xvstelm_d(sum0, dst, 0, 0); - __lasx_xvstelm_d(sum0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum1, dst, 0, 0); - __lasx_xvstelm_d(sum1, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum2, dst, 0, 0); - __lasx_xvstelm_d(sum2, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum3, dst, 0, 0); - __lasx_xvstelm_d(sum3, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum0, dst, 0, 2); - __lasx_xvstelm_d(sum0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum1, dst, 0, 2); - __lasx_xvstelm_d(sum1, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum2, dst, 0, 2); - __lasx_xvstelm_d(sum2, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum3, dst, 0, 2); - __lasx_xvstelm_d(sum3, dst, 8, 3); - dst += dst_stride; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += (1 - src_stride_4x); - src9 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src10, src11); - src12 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src13 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src14, src15); - src16 = __lasx_xvldx(_src, src_stride_3x); - _src += (src_stride_4x - 1); - DUP2_ARG2(__lasx_xvld, _src, 0, _src, 1, src8, src17); - - DUP4_ARG3(__lasx_xvpermi_q, src0, src4, 0x02, src1, src5, 0x02, src2, src6, 0x02, - src3, src7, 0x02, src0, src1, src2, src3); - DUP4_ARG3(__lasx_xvpermi_q, src4, src8, 0x02, src9, src13, 0x02, src10, src14, 0x02, - src11, src15, 0x02, src4, src5, src6, src7); - DUP2_ARG3(__lasx_xvpermi_q, src12, src16, 0x02, src13, src17, 0x02, src8, src9); - - DUP4_ARG2(__lasx_xvilvl_h, src5, src0, src6, src1, src7, src2, src8, src3, - sum0, sum2, sum4, sum6); - DUP4_ARG2(__lasx_xvilvh_h, src5, src0, src6, src1, src7, src2, src8, src3, - sum1, sum3, sum5, sum7); - src8 = __lasx_xvilvl_h(src9, src4); - src9 = __lasx_xvilvh_h(src9, src4); - - DUP4_ARG2(__lasx_xvhaddw_hu_bu, sum0, sum0, sum1, sum1, sum2, sum2, - sum3, sum3, src0, src1, src2, src3); - DUP4_ARG2(__lasx_xvhaddw_hu_bu, sum4, sum4, sum5, sum5, sum6, sum6, - sum7, sum7, src4, src5, src6, src7); - DUP2_ARG2(__lasx_xvhaddw_hu_bu, src8, src8, src9, src9, src8, src9); - - DUP4_ARG2(__lasx_xvadd_h, src0, src2, src1, src3, src2, src4, src3, src5, - sum0, sum1, sum2, sum3); - DUP4_ARG2(__lasx_xvadd_h, src4, src6, src5, src7, src6, src8, src7, src9, - sum4, sum5, sum6, sum7); - DUP4_ARG2(__lasx_xvaddi_hu, sum0, 1, sum1, 1, sum2, 1, sum3, 1, - sum0, sum1, sum2, sum3); - DUP4_ARG2(__lasx_xvaddi_hu, sum4, 1, sum5, 1, sum6, 1, sum7, 1, - sum4, sum5, sum6, sum7); - DUP4_ARG3(__lasx_xvsrani_b_h, sum1, sum0, 2, sum3, sum2, 2, sum5, sum4, 2, - sum7, sum6, 2, sum0, sum1, sum2, sum3); - __lasx_xvstelm_d(sum0, dst, 0, 0); - __lasx_xvstelm_d(sum0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum1, dst, 0, 0); - __lasx_xvstelm_d(sum1, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum2, dst, 0, 0); - __lasx_xvstelm_d(sum2, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum3, dst, 0, 0); - __lasx_xvstelm_d(sum3, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum0, dst, 0, 2); - __lasx_xvstelm_d(sum0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum1, dst, 0, 2); - __lasx_xvstelm_d(sum1, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum2, dst, 0, 2); - __lasx_xvstelm_d(sum2, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum3, dst, 0, 2); - __lasx_xvstelm_d(sum3, dst, 8, 3); -} - -static void common_hv_bil_no_rnd_8x16_lasx(const uint8_t *src, - int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7, src8, src9; - __m256i src10, src11, src12, src13, src14, src15, src16, src17; - __m256i sum0, sum1, sum2, sum3, sum4, sum5, sum6, sum7; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t* _src = (uint8_t*)src; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += (1 - src_stride_4x); - src9 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src10, src11); - src12 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src13 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src14, src15); - src16 = __lasx_xvldx(_src, src_stride_3x); - _src += (src_stride_4x - 1); - DUP2_ARG2(__lasx_xvld, _src, 0, _src, 1, src8, src17); - - DUP4_ARG3(__lasx_xvpermi_q, src0, src4, 0x02, src1, src5, 0x02, src2, - src6, 0x02, src3, src7, 0x02, src0, src1, src2, src3); - DUP4_ARG3(__lasx_xvpermi_q, src4, src8, 0x02, src9, src13, 0x02, src10, - src14, 0x02, src11, src15, 0x02, src4, src5, src6, src7); - DUP2_ARG3(__lasx_xvpermi_q, src12, src16, 0x02, src13, src17, 0x02, src8, src9); - - DUP4_ARG2(__lasx_xvilvl_h, src5, src0, src6, src1, src7, src2, src8, src3, - sum0, sum2, sum4, sum6); - DUP4_ARG2(__lasx_xvilvh_h, src5, src0, src6, src1, src7, src2, src8, src3, - sum1, sum3, sum5, sum7); - src8 = __lasx_xvilvl_h(src9, src4); - src9 = __lasx_xvilvh_h(src9, src4); + __m256i src0, src1, src2, src3, src4; + int32_t stride2x = line_size << 1; + int32_t stride4x = line_size << 2; + int32_t stride3x = stride2x + line_size; + uint8_t* _src = (uint8_t*)pixels; + int32_t h_4 = h >> 2; - DUP4_ARG2(__lasx_xvhaddw_hu_bu, sum0, sum0, sum1, sum1, sum2, sum2, - sum3, sum3, src0, src1, src2, src3); - DUP4_ARG2(__lasx_xvhaddw_hu_bu, sum4, sum4, sum5, sum5, sum6, sum6, - sum7, sum7, src4, src5, src6, src7); - DUP2_ARG2(__lasx_xvhaddw_hu_bu, src8, src8, src9, src9, src8, src9); + for (int i = 0; i < h_4; i++) { + src0 = __lasx_xvld(_src, 0); + DUP2_ARG2(__lasx_xvldx, _src, line_size, _src, stride2x, src1, src2); + src3 = __lasx_xvldx(_src, stride3x); + _src += stride4x; + src4 = __lasx_xvld(_src, 0); - DUP4_ARG2(__lasx_xvadd_h, src0, src2, src1, src3, src2, src4, src3, src5, - sum0, sum1, sum2, sum3); - DUP4_ARG2(__lasx_xvadd_h, src4, src6, src5, src7, src6, src8, src7, src9, - sum4, sum5, sum6, sum7); - DUP4_ARG2(__lasx_xvaddi_hu, sum0, 1, sum1, 1, sum2, 1, sum3, 1, - sum0, sum1, sum2, sum3); - DUP4_ARG2(__lasx_xvaddi_hu, sum4, 1, sum5, 1, sum6, 1, sum7, 1, - sum4, sum5, sum6, sum7); - DUP4_ARG3(__lasx_xvsrani_b_h, sum1, sum0, 2, sum3, sum2, 2, sum5, sum4, 2, - sum7, sum6, 2, sum0, sum1, sum2, sum3); - __lasx_xvstelm_d(sum0, dst, 0, 0); - __lasx_xvstelm_d(sum0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum1, dst, 0, 0); - __lasx_xvstelm_d(sum1, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum2, dst, 0, 0); - __lasx_xvstelm_d(sum2, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum3, dst, 0, 0); - __lasx_xvstelm_d(sum3, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum0, dst, 0, 2); - __lasx_xvstelm_d(sum0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum1, dst, 0, 2); - __lasx_xvstelm_d(sum1, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum2, dst, 0, 2); - __lasx_xvstelm_d(sum2, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum3, dst, 0, 2); - __lasx_xvstelm_d(sum3, dst, 8, 3); + DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src2, src1, 0x20, src3, src2, + 0x20, src4, src3, 0x20, src0, src1, src2, src3); + DUP2_ARG2(__lasx_xvavg_bu, src0, src1, src2, src3, src0, src2); + + __lasx_xvstelm_d(src0, block, 0, 0); + __lasx_xvstelm_d(src0, block, 8, 1); + block += line_size; + __lasx_xvstelm_d(src0, block, 0, 2); + __lasx_xvstelm_d(src0, block, 8, 3); + block += line_size; + __lasx_xvstelm_d(src2, block, 0, 0); + __lasx_xvstelm_d(src2, block, 8, 1); + block += line_size; + __lasx_xvstelm_d(src2, block, 0, 2); + __lasx_xvstelm_d(src2, block, 8, 3); + block += line_size; + } } void ff_put_no_rnd_pixels16_xy2_8_lasx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { - if (h == 16) { - common_hv_bil_no_rnd_16x16_lasx(pixels, line_size, block, line_size); - } else if (h == 8) { - common_hv_bil_no_rnd_8x16_lasx(pixels, line_size, block, line_size); - } -} - -static void common_hz_bil_no_rnd_8x8_lasx(const uint8_t *src, - int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7; - __m256i src8, src9, src10, src11, src12, src13, src14, src15; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t dst_stride_2x = dst_stride << 1; - int32_t dst_stride_4x = dst_stride << 2; - int32_t dst_stride_3x = dst_stride_2x + dst_stride; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t* _src = (uint8_t*)src; + __m256i src0, src1, src2, src3; + __m256i sum0, sum1, sum2; + src0 = __lasx_xvld(pixels, 0); + src1 = __lasx_xvld(pixels, 1); + src2 = __lasx_vext2xv_hu_bu(src0); + src3 = __lasx_vext2xv_hu_bu(src1); + sum0 = __lasx_xvadd_h(src2, src3); + sum0 = __lasx_xvaddi_hu(sum0, 1); - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += (1 - src_stride_4x); - src8 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src9, src10); - src11 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src12 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src13, src14); - src15 = __lasx_xvldx(_src, src_stride_3x); + for (int i= 0; i < h; i++) { + pixels += line_size; + src0 = __lasx_xvld(pixels, 0); + src1 = __lasx_xvld(pixels, 1); - DUP4_ARG2(__lasx_xvpickev_d, src1, src0, src3, src2, src5, src4, src7, - src6, src0, src1, src2, src3); - DUP4_ARG2(__lasx_xvpickev_d, src9, src8, src11, src10, src13, src12, src15, - src14, src4, src5, src6, src7); - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src3, src2, 0x20, src5, src4, - 0x20, src7, src6, 0x20, src0, src1, src2, src3); - src0 = __lasx_xvavg_bu(src0, src2); - src1 = __lasx_xvavg_bu(src1, src3); - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst + dst_stride, 0, 1); - __lasx_xvstelm_d(src0, dst + dst_stride_2x, 0, 2); - __lasx_xvstelm_d(src0, dst + dst_stride_3x, 0, 3); - dst += dst_stride_4x; - __lasx_xvstelm_d(src1, dst, 0, 0); - __lasx_xvstelm_d(src1, dst + dst_stride, 0, 1); - __lasx_xvstelm_d(src1, dst + dst_stride_2x, 0, 2); - __lasx_xvstelm_d(src1, dst + dst_stride_3x, 0, 3); -} + src2 = __lasx_vext2xv_hu_bu(src0); + src3 = __lasx_vext2xv_hu_bu(src1); + sum1 = __lasx_xvadd_h(src2, src3); + sum2 = __lasx_xvadd_h(sum0, sum1); + sum2 = __lasx_xvsrani_b_h(sum2, sum2, 2); -static void common_hz_bil_no_rnd_4x8_lasx(const uint8_t *src, - int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_3x = src_stride_2x + src_stride; - int32_t dst_stride_2x = dst_stride << 1; - int32_t dst_stride_3x = dst_stride_2x + dst_stride; - uint8_t *_src = (uint8_t*)src; + sum0 = __lasx_xvaddi_hu(sum1, 1); + __lasx_xvstelm_d(sum2, block, 0, 0); + __lasx_xvstelm_d(sum2, block, 8, 3); - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += 1; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - DUP4_ARG2(__lasx_xvpickev_d, src1, src0, src3, src2, src5, src4, src7, src6, - src0, src1, src2, src3); - DUP2_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src3, src2, 0x20, src0, src1); - src0 = __lasx_xvavg_bu(src0, src1); - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst + dst_stride, 0, 1); - __lasx_xvstelm_d(src0, dst + dst_stride_2x, 0, 2); - __lasx_xvstelm_d(src0, dst + dst_stride_3x, 0, 3); + block += line_size; + } } +/** + * For widths 8, h is always a positive multiple of 4. + * The function processes 4 rows per iteration. + */ void ff_put_no_rnd_pixels8_x2_8_lasx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { - if (h == 8) { - common_hz_bil_no_rnd_8x8_lasx(pixels, line_size, block, line_size); - } else if (h == 4) { - common_hz_bil_no_rnd_4x8_lasx(pixels, line_size, block, line_size); + __m256i src0, src1, src2, src3, src4, src5, src6, src7; + int32_t stride2x = line_size << 1; + int32_t stride3x = stride2x + line_size; + int32_t stride4x = line_size << 2; + uint8_t *_src = (uint8_t*)pixels + 1; + int32_t h_4 = h >> 2; + + for (int i = 0; i < h_4; i++) { + src0 = __lasx_xvld(pixels, 0); + DUP2_ARG2(__lasx_xvldx, pixels, line_size, pixels, stride2x, src1, src2); + src3 = __lasx_xvldx(pixels, stride3x); + src4 = __lasx_xvld(_src, 0); + DUP2_ARG2(__lasx_xvldx, _src, line_size, _src, stride2x, src5, src6); + src7 = __lasx_xvldx(_src, stride3x); + DUP4_ARG2(__lasx_xvpickev_d, src1, src0, src3, src2, src5, src4, src7, src6, + src0, src1, src2, src3); + DUP2_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src3, src2, 0x20, src0, src1); + src0 = __lasx_xvavg_bu(src0, src1); + __lasx_xvstelm_d(src0, block, 0, 0); + block += line_size; + __lasx_xvstelm_d(src0, block, 0, 1); + block += line_size; + __lasx_xvstelm_d(src0, block, 0, 2); + block += line_size; + __lasx_xvstelm_d(src0, block, 0, 3); + block += line_size; + + pixels += stride4x; + _src += stride4x; } } -static void common_vt_bil_no_rnd_8x8_lasx(const uint8_t *src, int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7, src8; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t dst_stride_2x = dst_stride << 1; - int32_t dst_stride_4x = dst_stride << 2; - int32_t dst_stride_3x = dst_stride_2x + dst_stride; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t* _src = (uint8_t*)src; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src8 = __lasx_xvld(_src, 0); - - DUP4_ARG2(__lasx_xvpickev_d, src1, src0, src2, src1, src3, src2, src4, src3, - src0, src1, src2, src3); - DUP4_ARG2(__lasx_xvpickev_d, src5, src4, src6, src5, src7, src6, src8, src7, - src4, src5, src6, src7); - DUP4_ARG3(__lasx_xvpermi_q, src2, src0, 0x20, src3, src1, 0x20, src6, src4, - 0x20, src7, src5, 0x20, src0, src1, src2, src3); - src0 = __lasx_xvavg_bu(src0, src1); - src1 = __lasx_xvavg_bu(src2, src3); - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst + dst_stride, 0, 1); - __lasx_xvstelm_d(src0, dst + dst_stride_2x, 0, 2); - __lasx_xvstelm_d(src0, dst + dst_stride_3x, 0, 3); - dst += dst_stride_4x; - __lasx_xvstelm_d(src1, dst, 0, 0); - __lasx_xvstelm_d(src1, dst + dst_stride, 0, 1); - __lasx_xvstelm_d(src1, dst + dst_stride_2x, 0, 2); - __lasx_xvstelm_d(src1, dst + dst_stride_3x, 0, 3); -} - -static void common_vt_bil_no_rnd_4x8_lasx(const uint8_t *src, int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t dst_stride_2x = dst_stride << 1; - int32_t dst_stride_3x = dst_stride_2x + dst_stride; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t* _src = (uint8_t*)src; - - src0 = __lasx_xvld(_src, 0); - DUP4_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, _src, - src_stride_3x, _src, src_stride_4x, src1, src2, src3, src4); - DUP4_ARG2(__lasx_xvpickev_d, src1, src0, src2, src1, src3, src2, src4, src3, - src0, src1, src2, src3); - DUP2_ARG3(__lasx_xvpermi_q, src2, src0, 0x20, src3, src1, 0x20, src0, src1); - src0 = __lasx_xvavg_bu(src0, src1); - __lasx_xvstelm_d(src0, dst, 0, 0); - __lasx_xvstelm_d(src0, dst + dst_stride, 0, 1); - __lasx_xvstelm_d(src0, dst + dst_stride_2x, 0, 2); - __lasx_xvstelm_d(src0, dst + dst_stride_3x, 0, 3); -} - +/** + * For widths 8, h is always a positive multiple of 4. + * The function processes 4 rows per iteration. + */ void ff_put_no_rnd_pixels8_y2_8_lasx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { - if (h == 8) { - common_vt_bil_no_rnd_8x8_lasx(pixels, line_size, block, line_size); - } else if (h == 4) { - common_vt_bil_no_rnd_4x8_lasx(pixels, line_size, block, line_size); - } -} - -static void common_hv_bil_no_rnd_8x8_lasx(const uint8_t *src, int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7; - __m256i src8, src9, src10, src11, src12, src13, src14, src15, src16, src17; - __m256i sum0, sum1, sum2, sum3; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t dst_stride_2x = dst_stride << 1; - int32_t dst_stride_4x = dst_stride << 2; - int32_t dst_stride_3x = dst_stride_2x + dst_stride; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t* _src = (uint8_t*)src; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += (1 - src_stride_4x); - src9 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src10, src11); - src12 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src13 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src14, src15); - src16 = __lasx_xvldx(_src, src_stride_3x); - _src += (src_stride_4x - 1); - DUP2_ARG2(__lasx_xvld, _src, 0, _src, 1, src8, src17); - - DUP4_ARG2(__lasx_xvilvl_b, src9, src0, src10, src1, src11, src2, src12, src3, - src0, src1, src2, src3); - DUP4_ARG2(__lasx_xvilvl_b, src13, src4, src14, src5, src15, src6, src16, src7, - src4, src5, src6, src7); - src8 = __lasx_xvilvl_b(src17, src8); - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src2, src1, 0x20, src3, src2, - 0x20, src4, src3, 0x20, src0, src1, src2, src3); - DUP4_ARG3(__lasx_xvpermi_q, src5, src4, 0x20, src6, src5, 0x20, src7, src6, - 0x20, src8, src7, 0x20, src4, src5, src6, src7); - DUP4_ARG2(__lasx_xvhaddw_hu_bu, src0, src0, src1, src1, src2, src2, - src3, src3, src0, src1, src2, src3); - DUP4_ARG2(__lasx_xvhaddw_hu_bu, src4, src4, src5, src5, src6, src6, - src7, src7, src4, src5, src6, src7); - DUP4_ARG2(__lasx_xvadd_h, src0, src1, src2, src3, src4, src5, src6, src7, - sum0, sum1, sum2, sum3); - DUP4_ARG2(__lasx_xvaddi_hu, sum0, 1, sum1, 1, sum2, 1, sum3, 1, - sum0, sum1, sum2, sum3); - DUP2_ARG3(__lasx_xvsrani_b_h, sum1, sum0, 2, sum3, sum2, 2, sum0, sum1); - __lasx_xvstelm_d(sum0, dst, 0, 0); - __lasx_xvstelm_d(sum0, dst + dst_stride, 0, 2); - __lasx_xvstelm_d(sum0, dst + dst_stride_2x, 0, 1); - __lasx_xvstelm_d(sum0, dst + dst_stride_3x, 0, 3); - dst += dst_stride_4x; - __lasx_xvstelm_d(sum1, dst, 0, 0); - __lasx_xvstelm_d(sum1, dst + dst_stride, 0, 2); - __lasx_xvstelm_d(sum1, dst + dst_stride_2x, 0, 1); - __lasx_xvstelm_d(sum1, dst + dst_stride_3x, 0, 3); -} - -static void common_hv_bil_no_rnd_4x8_lasx(const uint8_t *src, int32_t src_stride, - uint8_t *dst, int32_t dst_stride) -{ - __m256i src0, src1, src2, src3, src4, src5, src6, src7; - __m256i src8, src9, sum0, sum1; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t dst_stride_2x = dst_stride << 1; - int32_t dst_stride_3x = dst_stride_2x + dst_stride; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t *_src = (uint8_t*)src; - - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += 1; - src5 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src6, src7); - src8 = __lasx_xvldx(_src, src_stride_3x); - _src += (src_stride_4x - 1); - DUP2_ARG2(__lasx_xvld, _src, 0, _src, 1, src4, src9); - - DUP4_ARG2(__lasx_xvilvl_b, src5, src0, src6, src1, src7, src2, src8, src3, - src0, src1, src2, src3); - src4 = __lasx_xvilvl_b(src9, src4); - DUP4_ARG3(__lasx_xvpermi_q, src1, src0, 0x20, src2, src1, 0x20, src3, src2, - 0x20, src4, src3, 0x20, src0, src1, src2, src3); - DUP4_ARG2(__lasx_xvhaddw_hu_bu, src0, src0, src1, src1, src2, src2, - src3, src3, src0, src1, src2, src3); - DUP2_ARG2(__lasx_xvadd_h, src0, src1, src2, src3, sum0, sum1); - sum0 = __lasx_xvaddi_hu(sum0, 1); - sum1 = __lasx_xvaddi_hu(sum1, 1); - sum0 = __lasx_xvsrani_b_h(sum1, sum0, 2); - __lasx_xvstelm_d(sum0, dst, 0, 0); - __lasx_xvstelm_d(sum0, dst + dst_stride, 0, 2); - __lasx_xvstelm_d(sum0, dst + dst_stride_2x, 0, 1); - __lasx_xvstelm_d(sum0, dst + dst_stride_3x, 0, 3); -} + __m256i src0, src1, src2, src3, src4; + int32_t stride2x = line_size << 1; + int32_t stride4x = line_size << 2; + int32_t stride3x = stride2x + line_size; + uint8_t* _src = (uint8_t*)pixels; + int32_t h_4 = h >> 2; -void ff_put_no_rnd_pixels8_xy2_8_lasx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h) -{ - if (h == 8) { - common_hv_bil_no_rnd_8x8_lasx(pixels, line_size, block, line_size); - } else if (h == 4) { - common_hv_bil_no_rnd_4x8_lasx(pixels, line_size, block, line_size); + for (int i = 0; i < h_4; i++) { + src0 = __lasx_xvld(_src, 0); + DUP4_ARG2(__lasx_xvldx, _src, line_size, _src, stride2x, _src, + stride3x, _src, stride4x, src1, src2, src3, src4); + DUP4_ARG2(__lasx_xvpickev_d, src1, src0, src2, src1, src3, src2, src4, src3, + src0, src1, src2, src3); + DUP2_ARG3(__lasx_xvpermi_q, src2, src0, 0x20, src3, src1, 0x20, src0, src1); + src0 = __lasx_xvavg_bu(src0, src1); + __lasx_xvstelm_d(src0, block, 0, 0); + block += line_size; + __lasx_xvstelm_d(src0, block, 0, 1); + block += line_size; + __lasx_xvstelm_d(src0, block, 0, 2); + block += line_size; + __lasx_xvstelm_d(src0, block, 0, 3); + block += line_size; + + _src += stride4x; } } -static void common_hv_bil_16w_lasx(const uint8_t *src, int32_t src_stride, - uint8_t *dst, int32_t dst_stride, - uint8_t height) +void ff_put_no_rnd_pixels8_xy2_8_lsx(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h) { - __m256i src0, src1, src2, src3, src4, src5, src6, src7, src8, src9; - __m256i src10, src11, src12, src13, src14, src15, src16, src17; - __m256i sum0, sum1, sum2, sum3, sum4, sum5, sum6, sum7; - uint8_t loop_cnt; - int32_t src_stride_2x = src_stride << 1; - int32_t src_stride_4x = src_stride << 2; - int32_t src_stride_3x = src_stride_2x + src_stride; - uint8_t* _src = (uint8_t*)src; - - for (loop_cnt = (height >> 3); loop_cnt--;) { - src0 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src1, src2); - src3 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src4 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, src5, src6); - src7 = __lasx_xvldx(_src, src_stride_3x); - _src += (1 - src_stride_4x); - src9 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src10, src11); - src12 = __lasx_xvldx(_src, src_stride_3x); - _src += src_stride_4x; - src13 = __lasx_xvld(_src, 0); - DUP2_ARG2(__lasx_xvldx, _src, src_stride, _src, src_stride_2x, - src14, src15); - src16 = __lasx_xvldx(_src, src_stride_3x); - _src += (src_stride_4x - 1); - DUP2_ARG2(__lasx_xvld, _src, 0, _src, 1, src8, src17); - - DUP4_ARG3(__lasx_xvpermi_q, src0, src4, 0x02, src1, src5, 0x02, src2, - src6, 0x02, src3, src7, 0x02, src0, src1, src2, src3); - DUP4_ARG3(__lasx_xvpermi_q, src4, src8, 0x02, src9, src13, 0x02, src10, - src14, 0x02, src11, src15, 0x02, src4, src5, src6, src7); - DUP2_ARG3(__lasx_xvpermi_q, src12, src16, 0x02, src13, src17, 0x02, - src8, src9); - - DUP4_ARG2(__lasx_xvilvl_h, src5, src0, src6, src1, src7, src2, src8, - src3, sum0, sum2, sum4, sum6); - DUP4_ARG2(__lasx_xvilvh_h, src5, src0, src6, src1, src7, src2, src8, - src3, sum1, sum3, sum5, sum7); - src8 = __lasx_xvilvl_h(src9, src4); - src9 = __lasx_xvilvh_h(src9, src4); - - DUP4_ARG2(__lasx_xvhaddw_hu_bu, sum0, sum0, sum1, sum1, sum2, sum2, - sum3, sum3, src0, src1, src2, src3); - DUP4_ARG2(__lasx_xvhaddw_hu_bu, sum4, sum4, sum5, sum5, sum6, sum6, - sum7, sum7, src4, src5, src6, src7); - DUP2_ARG2(__lasx_xvhaddw_hu_bu, src8, src8, src9, src9, src8, src9); - - DUP4_ARG2(__lasx_xvadd_h, src0, src2, src1, src3, src2, src4, src3, - src5, sum0, sum1, sum2, sum3); - DUP4_ARG2(__lasx_xvadd_h, src4, src6, src5, src7, src6, src8, src7, - src9, sum4, sum5, sum6, sum7); - DUP4_ARG3(__lasx_xvsrarni_b_h, sum1, sum0, 2, sum3, sum2, 2, sum5, - sum4, 2, sum7, sum6, 2, sum0, sum1, sum2, sum3); - __lasx_xvstelm_d(sum0, dst, 0, 0); - __lasx_xvstelm_d(sum0, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum1, dst, 0, 0); - __lasx_xvstelm_d(sum1, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum2, dst, 0, 0); - __lasx_xvstelm_d(sum2, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum3, dst, 0, 0); - __lasx_xvstelm_d(sum3, dst, 8, 1); - dst += dst_stride; - __lasx_xvstelm_d(sum0, dst, 0, 2); - __lasx_xvstelm_d(sum0, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum1, dst, 0, 2); - __lasx_xvstelm_d(sum1, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum2, dst, 0, 2); - __lasx_xvstelm_d(sum2, dst, 8, 3); - dst += dst_stride; - __lasx_xvstelm_d(sum3, dst, 0, 2); - __lasx_xvstelm_d(sum3, dst, 8, 3); - dst += dst_stride; + __m128i src0, src1, src2, src3; + __m128i sum0, sum1, sum2; + + src0 = __lsx_vld(pixels, 0); + src1 = __lsx_vld(pixels, 1); + src2 = __lsx_vsllwil_hu_bu(src0, 0); + src3 = __lsx_vsllwil_hu_bu(src1, 0); + sum0 = __lsx_vadd_h(src2, src3); + sum0 = __lsx_vaddi_hu(sum0, 1); + + for (int i = 0; i < h; i++) { + pixels += line_size; + src0 = __lsx_vld(pixels, 0); + src1 = __lsx_vld(pixels, 1); + src2 = __lsx_vsllwil_hu_bu(src0, 0); + src3 = __lsx_vsllwil_hu_bu(src1, 0); + sum1 = __lsx_vadd_h(src2, src3); + sum2 = __lsx_vadd_h(sum0, sum1); + sum2 = __lsx_vsrani_b_h(sum2, sum2, 2); + + sum0 = __lsx_vaddi_hu(sum1, 1); + __lsx_vstelm_d(sum2, block, 0, 0); + + block += line_size; } } void ff_put_pixels16_xy2_8_lasx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { - common_hv_bil_16w_lasx(pixels, line_size, block, line_size, h); + __m256i src0, src1, src2, src3; + __m256i sum0, sum1, sum2; + + src0 = __lasx_xvld(pixels, 0); + src1 = __lasx_xvld(pixels, 1); + src2 = __lasx_vext2xv_hu_bu(src0); + src3 = __lasx_vext2xv_hu_bu(src1); + sum0 = __lasx_xvadd_h(src2, src3); + sum0 = __lasx_xvaddi_hu(sum0, 2); + + for (int i = 0; i < h; i++) { + pixels += line_size; + src0 = __lasx_xvld(pixels, 0); + src1 = __lasx_xvld(pixels, 1); + + src2 = __lasx_vext2xv_hu_bu(src0); + src3 = __lasx_vext2xv_hu_bu(src1); + sum1 = __lasx_xvadd_h(src2, src3); + sum2 = __lasx_xvadd_h(sum0, sum1); + sum2 = __lasx_xvsrani_b_h(sum2, sum2, 2); + sum0 = __lasx_xvaddi_hu(sum1, 2); + __lasx_xvstelm_d(sum2, block, 0, 0); + __lasx_xvstelm_d(sum2, block, 8, 3); + block += line_size; + } } static void common_hv_bil_8w_lasx(const uint8_t *src, int32_t src_stride, diff --git a/libavcodec/loongarch/hpeldsp_lasx.h b/libavcodec/loongarch/hpeldsp_lasx.h index 2e035eade8..df3987d308 100644 --- a/libavcodec/loongarch/hpeldsp_lasx.h +++ b/libavcodec/loongarch/hpeldsp_lasx.h @@ -49,8 +49,8 @@ void ff_put_no_rnd_pixels8_x2_8_lasx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); void ff_put_no_rnd_pixels8_y2_8_lasx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); -void ff_put_no_rnd_pixels8_xy2_8_lasx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); +void ff_put_no_rnd_pixels8_xy2_8_lsx(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); void ff_put_pixels8_xy2_8_lasx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); void ff_put_pixels16_xy2_8_lasx(uint8_t *block, const uint8_t *pixels, ----------------------------------------------------------------------- Summary of changes: libavcodec/loongarch/hpeldsp_init_loongarch.c | 2 +- libavcodec/loongarch/hpeldsp_lasx.c | 1192 +++++-------------------- libavcodec/loongarch/hpeldsp_lasx.h | 4 +- 3 files changed, 231 insertions(+), 967 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 413346bd06 tests/fate/ffmpeg: add test for -force_key_frames scd_metadata
by ffmpeg-git＠ffmpeg.org 02 Dec '25

02 Dec '25

The branch, master has been updated via 413346bd06c33226254dacc829f128a6b6c337d7 (commit) via 540aacf7591c92514a62d86d5441c82ded3ccafc (commit) from 27e94281d1c880b4cae28738e35c0d6f9a58f06b (commit) - Log ----------------------------------------------------------------- commit 413346bd06c33226254dacc829f128a6b6c337d7 Author: Zhao Zhili <quinkblack(a)foxmail.com> AuthorDate: Sun Nov 30 16:55:02 2025 +0800 Commit: Zhao Zhili <quink(a)noreply.code.ffmpeg.org> CommitDate: Tue Dec 2 03:03:55 2025 +0000 tests/fate/ffmpeg: add test for -force_key_frames scd_metadata diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 57028a7936..c0da2da7f8 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -40,8 +40,13 @@ fate-force_key_frames-source-dup: CMD = framecrc -i $(TARGET_SAMPLES)/h264/intra -c:v mpeg2video -g 400 -sc_threshold 99999 \ -force_key_frames source -r 39 -force_fps -strict experimental -FATE_SAMPLES_FFMPEG-$(call ENCDEC, MPEG2VIDEO H264, FRAMECRC H264, H264_PARSER CROP_FILTER DRAWBOX_FILTER PIPE_PROTOCOL) += \ - fate-force_key_frames-source fate-force_key_frames-source-drop fate-force_key_frames-source-dup +fate-force_key_frames-scd_metadata: CMD = framecrc -i $(TARGET_SAMPLES)/h264/intra_refresh.h264 \ + -vf scdet=threshold=10,crop=2:2,drawbox=color=black:t=fill \ + -c:v mpeg2video -g 400 \ + -force_key_frames scd_metadata + +FATE_SAMPLES_FFMPEG-$(call ENCDEC, MPEG2VIDEO H264, FRAMECRC H264, H264_PARSER CROP_FILTER DRAWBOX_FILTER SCDET_FILTER PIPE_PROTOCOL) += \ + fate-force_key_frames-source fate-force_key_frames-source-drop fate-force_key_frames-source-dup fate-force_key_frames-scd_metadata # Tests that the video is properly autorotated using the contained # display matrix and that the generated file does not contain diff --git a/tests/ref/fate/force_key_frames-scd_metadata b/tests/ref/fate/force_key_frames-scd_metadata new file mode 100644 index 0000000000..f5757bf6c8 --- /dev/null +++ b/tests/ref/fate/force_key_frames-scd_metadata @@ -0,0 +1,397 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: mpeg2video +#dimensions 0: 2x2 +#sar 0: 0/1 +0, -1, 0, 1, 57, 0x7db00eb7, S=1, Quality stats, 8, 0x05ec00be +0, 0, 1, 1, 24, 0x4f1c0660, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 1, 2, 1, 24, 0x53dc06a0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 2, 3, 1, 24, 0x589c06e0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 3, 4, 1, 24, 0x4a700621, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 4, 5, 1, 24, 0x4f300661, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 5, 6, 1, 24, 0x53f006a1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 6, 7, 1, 24, 0x58b006e1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 7, 8, 1, 24, 0x4a840622, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 8, 9, 1, 24, 0x4f440662, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 9, 10, 1, 24, 0x540406a2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 10, 11, 1, 24, 0x58c406e2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 11, 12, 1, 24, 0x4a980623, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 12, 13, 1, 24, 0x4f580663, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 13, 14, 1, 24, 0x541806a3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 14, 15, 1, 24, 0x58d806e3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 15, 16, 1, 24, 0x4aac0624, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 16, 17, 1, 24, 0x4f6c0664, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 17, 18, 1, 24, 0x542c06a4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 18, 19, 1, 24, 0x58ec06e4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 19, 20, 1, 24, 0x4ac00625, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 20, 21, 1, 24, 0x4f800665, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 21, 22, 1, 24, 0x544006a5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 22, 23, 1, 24, 0x590006e5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 23, 24, 1, 24, 0x4ad40626, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 24, 25, 1, 24, 0x4f940666, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 25, 26, 1, 24, 0x545406a6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 26, 27, 1, 24, 0x591406e6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 27, 28, 1, 24, 0x4ae80627, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 28, 29, 1, 24, 0x4fa80667, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 29, 30, 1, 24, 0x546806a7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 30, 31, 1, 24, 0x592806e7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 31, 32, 1, 24, 0x4afc0628, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 32, 33, 1, 24, 0x4fbc0668, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 33, 34, 1, 24, 0x547c06a8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 34, 35, 1, 24, 0x593c06e8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 35, 36, 1, 24, 0x4b100629, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 36, 37, 1, 24, 0x4fd00669, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 37, 38, 1, 24, 0x549006a9, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 38, 39, 1, 24, 0x595006e9, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 39, 40, 1, 24, 0x4b24062a, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 40, 41, 1, 24, 0x4fe4066a, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 41, 42, 1, 24, 0x54a406aa, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 42, 43, 1, 24, 0x596406ea, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 43, 44, 1, 24, 0x4b38062b, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 44, 45, 1, 24, 0x4ff8066b, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 45, 46, 1, 24, 0x54b806ab, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 46, 47, 1, 24, 0x597806eb, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 47, 48, 1, 24, 0x4b4c062c, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 48, 49, 1, 24, 0x500c066c, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 49, 50, 1, 24, 0x54cc06ac, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 50, 51, 1, 24, 0x598c06ec, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 51, 52, 1, 24, 0x4b60062d, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 52, 53, 1, 24, 0x5020066d, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 53, 54, 1, 24, 0x54e006ad, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 54, 55, 1, 24, 0x59a006ed, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 55, 56, 1, 24, 0x4b74062e, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 56, 57, 1, 24, 0x5034066e, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 57, 58, 1, 24, 0x54f406ae, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 58, 59, 1, 24, 0x59b406ee, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 59, 60, 1, 24, 0x4b88062f, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 60, 61, 1, 24, 0x5048066f, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 61, 62, 1, 24, 0x550806af, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 62, 63, 1, 24, 0x59c806ef, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 63, 64, 1, 24, 0x4b9c0630, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 64, 65, 1, 24, 0x505c0670, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 65, 66, 1, 24, 0x551c06b0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 66, 67, 1, 24, 0x59dc06f0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 67, 68, 1, 24, 0x4bb00631, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 68, 69, 1, 24, 0x50700671, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 69, 70, 1, 24, 0x553006b1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 70, 71, 1, 24, 0x59f006f1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 71, 72, 1, 24, 0x4bc40632, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 72, 73, 1, 24, 0x50840672, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 73, 74, 1, 24, 0x554406b2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 74, 75, 1, 24, 0x5a0406f2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 75, 76, 1, 24, 0x4bd80633, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 76, 77, 1, 24, 0x50980673, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 77, 78, 1, 24, 0x555806b3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 78, 79, 1, 24, 0x5a1806f3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 79, 80, 1, 24, 0x4bec0634, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 80, 81, 1, 24, 0x50ac0674, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 81, 82, 1, 24, 0x556c06b4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 82, 83, 1, 24, 0x5a2c06f4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 83, 84, 1, 24, 0x4c000635, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 84, 85, 1, 24, 0x50c00675, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 85, 86, 1, 24, 0x558006b5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 86, 87, 1, 24, 0x5a4006f5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 87, 88, 1, 24, 0x4c140636, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 88, 89, 1, 24, 0x50d40676, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 89, 90, 1, 24, 0x559406b6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 90, 91, 1, 24, 0x5a5406f6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 91, 92, 1, 24, 0x4c280637, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 92, 93, 1, 24, 0x50e80677, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 93, 94, 1, 24, 0x55a806b7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 94, 95, 1, 24, 0x5a6806f7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 95, 96, 1, 24, 0x4c3c0638, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 96, 97, 1, 24, 0x50fc0678, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 97, 98, 1, 24, 0x55bc06b8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 98, 99, 1, 24, 0x5a7c06f8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 99, 100, 1, 24, 0x4c500639, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 100, 101, 1, 24, 0x51100679, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 101, 102, 1, 24, 0x55d006b9, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 102, 103, 1, 24, 0x5a9006f9, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 103, 104, 1, 24, 0x4c64063a, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 104, 105, 1, 24, 0x5124067a, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 105, 106, 1, 24, 0x55e406ba, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 106, 107, 1, 24, 0x5aa406fa, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 107, 108, 1, 57, 0x85a40efb, S=1, Quality stats, 8, 0x05ec00be +0, 108, 109, 1, 24, 0x4f1c0660, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 109, 110, 1, 24, 0x53dc06a0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 110, 111, 1, 24, 0x589c06e0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 111, 112, 1, 24, 0x4a700621, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 112, 113, 1, 24, 0x4f300661, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 113, 114, 1, 24, 0x53f006a1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 114, 115, 1, 24, 0x58b006e1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 115, 116, 1, 24, 0x4a840622, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 116, 117, 1, 24, 0x4f440662, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 117, 118, 1, 24, 0x540406a2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 118, 119, 1, 24, 0x58c406e2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 119, 120, 1, 24, 0x4a980623, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 120, 121, 1, 24, 0x4f580663, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 121, 122, 1, 24, 0x541806a3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 122, 123, 1, 24, 0x58d806e3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 123, 124, 1, 24, 0x4aac0624, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 124, 125, 1, 24, 0x4f6c0664, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 125, 126, 1, 24, 0x542c06a4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 126, 127, 1, 24, 0x58ec06e4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 127, 128, 1, 24, 0x4ac00625, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 128, 129, 1, 24, 0x4f800665, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 129, 130, 1, 24, 0x544006a5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 130, 131, 1, 24, 0x590006e5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 131, 132, 1, 24, 0x4ad40626, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 132, 133, 1, 24, 0x4f940666, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 133, 134, 1, 24, 0x545406a6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 134, 135, 1, 24, 0x591406e6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 135, 136, 1, 24, 0x4ae80627, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 136, 137, 1, 24, 0x4fa80667, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 137, 138, 1, 24, 0x546806a7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 138, 139, 1, 24, 0x592806e7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 139, 140, 1, 24, 0x4afc0628, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 140, 141, 1, 24, 0x4fbc0668, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 141, 142, 1, 24, 0x547c06a8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 142, 143, 1, 24, 0x593c06e8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 143, 144, 1, 24, 0x4b100629, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 144, 145, 1, 24, 0x4fd00669, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 145, 146, 1, 24, 0x549006a9, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 146, 147, 1, 24, 0x595006e9, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 147, 148, 1, 24, 0x4b24062a, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 148, 149, 1, 24, 0x4fe4066a, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 149, 150, 1, 24, 0x54a406aa, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 150, 151, 1, 24, 0x596406ea, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 151, 152, 1, 57, 0x8c8d0f38, S=1, Quality stats, 8, 0x05ec00be +0, 152, 153, 1, 24, 0x4f1c0660, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 153, 154, 1, 24, 0x53dc06a0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 154, 155, 1, 24, 0x589c06e0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 155, 156, 1, 24, 0x4a700621, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 156, 157, 1, 24, 0x4f300661, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 157, 158, 1, 24, 0x53f006a1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 158, 159, 1, 24, 0x58b006e1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 159, 160, 1, 24, 0x4a840622, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 160, 161, 1, 24, 0x4f440662, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 161, 162, 1, 24, 0x540406a2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 162, 163, 1, 24, 0x58c406e2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 163, 164, 1, 24, 0x4a980623, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 164, 165, 1, 24, 0x4f580663, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 165, 166, 1, 24, 0x541806a3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 166, 167, 1, 24, 0x58d806e3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 167, 168, 1, 24, 0x4aac0624, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 168, 169, 1, 24, 0x4f6c0664, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 169, 170, 1, 24, 0x542c06a4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 170, 171, 1, 24, 0x58ec06e4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 171, 172, 1, 24, 0x4ac00625, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 172, 173, 1, 24, 0x4f800665, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 173, 174, 1, 24, 0x544006a5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 174, 175, 1, 24, 0x590006e5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 175, 176, 1, 24, 0x4ad40626, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 176, 177, 1, 24, 0x4f940666, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 177, 178, 1, 24, 0x545406a6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 178, 179, 1, 24, 0x591406e6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 179, 180, 1, 24, 0x4ae80627, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 180, 181, 1, 24, 0x4fa80667, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 181, 182, 1, 24, 0x546806a7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 182, 183, 1, 24, 0x592806e7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 183, 184, 1, 24, 0x4afc0628, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 184, 185, 1, 24, 0x4fbc0668, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 185, 186, 1, 24, 0x547c06a8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 186, 187, 1, 24, 0x593c06e8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 187, 188, 1, 24, 0x4b100629, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 188, 189, 1, 24, 0x4fd00669, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 189, 190, 1, 24, 0x549006a9, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 190, 191, 1, 24, 0x595006e9, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 191, 192, 1, 24, 0x4b24062a, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 192, 193, 1, 24, 0x4fe4066a, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 193, 194, 1, 24, 0x54a406aa, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 194, 195, 1, 24, 0x596406ea, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 195, 196, 1, 24, 0x4b38062b, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 196, 197, 1, 24, 0x4ff8066b, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 197, 198, 1, 24, 0x54b806ab, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 198, 199, 1, 24, 0x597806eb, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 199, 200, 1, 24, 0x4b4c062c, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 200, 201, 1, 24, 0x500c066c, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 201, 202, 1, 24, 0x54cc06ac, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 202, 203, 1, 24, 0x598c06ec, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 203, 204, 1, 24, 0x4b60062d, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 204, 205, 1, 24, 0x5020066d, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 205, 206, 1, 24, 0x54e006ad, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 206, 207, 1, 24, 0x59a006ed, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 207, 208, 1, 24, 0x4b74062e, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 208, 209, 1, 24, 0x5034066e, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 209, 210, 1, 24, 0x54f406ae, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 210, 211, 1, 24, 0x59b406ee, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 211, 212, 1, 24, 0x4b88062f, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 212, 213, 1, 24, 0x5048066f, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 213, 214, 1, 24, 0x550806af, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 214, 215, 1, 24, 0x59c806ef, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 215, 216, 1, 24, 0x4b9c0630, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 216, 217, 1, 24, 0x505c0670, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 217, 218, 1, 24, 0x551c06b0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 218, 219, 1, 24, 0x59dc06f0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 219, 220, 1, 24, 0x4bb00631, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 220, 221, 1, 24, 0x50700671, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 221, 222, 1, 24, 0x553006b1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 222, 223, 1, 24, 0x59f006f1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 223, 224, 1, 24, 0x4bc40632, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 224, 225, 1, 24, 0x50840672, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 225, 226, 1, 24, 0x554406b2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 226, 227, 1, 24, 0x5a0406f2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 227, 228, 1, 24, 0x4bd80633, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 228, 229, 1, 24, 0x50980673, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 229, 230, 1, 24, 0x555806b3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 230, 231, 1, 24, 0x5a1806f3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 231, 232, 1, 24, 0x4bec0634, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 232, 233, 1, 24, 0x50ac0674, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 233, 234, 1, 24, 0x556c06b4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 234, 235, 1, 24, 0x5a2c06f4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 235, 236, 1, 24, 0x4c000635, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 236, 237, 1, 57, 0x7b1c0e9e, S=1, Quality stats, 8, 0x05ec00be +0, 237, 238, 1, 24, 0x4f1c0660, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 238, 239, 1, 24, 0x53dc06a0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 239, 240, 1, 24, 0x589c06e0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 240, 241, 1, 24, 0x4a700621, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 241, 242, 1, 24, 0x4f300661, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 242, 243, 1, 24, 0x53f006a1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 243, 244, 1, 24, 0x58b006e1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 244, 245, 1, 24, 0x4a840622, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 245, 246, 1, 24, 0x4f440662, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 246, 247, 1, 24, 0x540406a2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 247, 248, 1, 24, 0x58c406e2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 248, 249, 1, 24, 0x4a980623, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 249, 250, 1, 24, 0x4f580663, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 250, 251, 1, 24, 0x541806a3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 251, 252, 1, 24, 0x58d806e3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 252, 253, 1, 24, 0x4aac0624, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 253, 254, 1, 24, 0x4f6c0664, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 254, 255, 1, 24, 0x542c06a4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 255, 256, 1, 24, 0x58ec06e4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 256, 257, 1, 24, 0x4ac00625, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 257, 258, 1, 24, 0x4f800665, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 258, 259, 1, 24, 0x544006a5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 259, 260, 1, 24, 0x590006e5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 260, 261, 1, 24, 0x4ad40626, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 261, 262, 1, 24, 0x4f940666, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 262, 263, 1, 24, 0x545406a6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 263, 264, 1, 24, 0x591406e6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 264, 265, 1, 24, 0x4ae80627, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 265, 266, 1, 24, 0x4fa80667, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 266, 267, 1, 24, 0x546806a7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 267, 268, 1, 24, 0x592806e7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 268, 269, 1, 24, 0x4afc0628, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 269, 270, 1, 24, 0x4fbc0668, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 270, 271, 1, 24, 0x547c06a8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 271, 272, 1, 24, 0x593c06e8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 272, 273, 1, 24, 0x4b100629, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 273, 274, 1, 24, 0x4fd00669, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 274, 275, 1, 24, 0x549006a9, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 275, 276, 1, 24, 0x595006e9, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 276, 277, 1, 24, 0x4b24062a, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 277, 278, 1, 24, 0x4fe4066a, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 278, 279, 1, 24, 0x54a406aa, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 279, 280, 1, 24, 0x596406ea, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 280, 281, 1, 24, 0x4b38062b, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 281, 282, 1, 24, 0x4ff8066b, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 282, 283, 1, 24, 0x54b806ab, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 283, 284, 1, 24, 0x597806eb, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 284, 285, 1, 24, 0x4b4c062c, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 285, 286, 1, 24, 0x500c066c, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 286, 287, 1, 24, 0x54cc06ac, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 287, 288, 1, 24, 0x598c06ec, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 288, 289, 1, 24, 0x4b60062d, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 289, 290, 1, 24, 0x5020066d, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 290, 291, 1, 24, 0x54e006ad, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 291, 292, 1, 24, 0x59a006ed, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 292, 293, 1, 24, 0x4b74062e, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 293, 294, 1, 24, 0x5034066e, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 294, 295, 1, 24, 0x54f406ae, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 295, 296, 1, 24, 0x59b406ee, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 296, 297, 1, 24, 0x4b88062f, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 297, 298, 1, 24, 0x5048066f, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 298, 299, 1, 24, 0x550806af, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 299, 300, 1, 24, 0x59c806ef, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 300, 301, 1, 24, 0x4b9c0630, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 301, 302, 1, 24, 0x505c0670, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 302, 303, 1, 24, 0x551c06b0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 303, 304, 1, 24, 0x59dc06f0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 304, 305, 1, 24, 0x4bb00631, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 305, 306, 1, 24, 0x50700671, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 306, 307, 1, 24, 0x553006b1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 307, 308, 1, 24, 0x59f006f1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 308, 309, 1, 24, 0x4bc40632, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 309, 310, 1, 24, 0x50840672, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 310, 311, 1, 24, 0x554406b2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 311, 312, 1, 24, 0x5a0406f2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 312, 313, 1, 24, 0x4bd80633, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 313, 314, 1, 24, 0x50980673, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 314, 315, 1, 24, 0x555806b3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 315, 316, 1, 24, 0x5a1806f3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 316, 317, 1, 24, 0x4bec0634, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 317, 318, 1, 24, 0x50ac0674, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 318, 319, 1, 24, 0x556c06b4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 319, 320, 1, 24, 0x5a2c06f4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 320, 321, 1, 24, 0x4c000635, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 321, 322, 1, 24, 0x50c00675, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 322, 323, 1, 24, 0x558006b5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 323, 324, 1, 24, 0x5a4006f5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 324, 325, 1, 24, 0x4c140636, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 325, 326, 1, 24, 0x50d40676, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 326, 327, 1, 24, 0x559406b6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 327, 328, 1, 24, 0x5a5406f6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 328, 329, 1, 24, 0x4c280637, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 329, 330, 1, 24, 0x50e80677, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 330, 331, 1, 24, 0x55a806b7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 331, 332, 1, 24, 0x5a6806f7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 332, 333, 1, 24, 0x4c3c0638, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 333, 334, 1, 24, 0x50fc0678, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 334, 335, 1, 24, 0x55bc06b8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 335, 336, 1, 24, 0x5a7c06f8, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 336, 337, 1, 57, 0x899c0f1e, S=1, Quality stats, 8, 0x05ec00be +0, 337, 338, 1, 24, 0x4f1c0660, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 338, 339, 1, 24, 0x53dc06a0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 339, 340, 1, 24, 0x589c06e0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 340, 341, 1, 24, 0x4a700621, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 341, 342, 1, 24, 0x4f300661, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 342, 343, 1, 24, 0x53f006a1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 343, 344, 1, 24, 0x58b006e1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 344, 345, 1, 24, 0x4a840622, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 345, 346, 1, 24, 0x4f440662, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 346, 347, 1, 24, 0x540406a2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 347, 348, 1, 24, 0x58c406e2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 348, 349, 1, 24, 0x4a980623, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 349, 350, 1, 24, 0x4f580663, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 350, 351, 1, 24, 0x541806a3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 351, 352, 1, 24, 0x58d806e3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 352, 353, 1, 24, 0x4aac0624, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 353, 354, 1, 24, 0x4f6c0664, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 354, 355, 1, 24, 0x542c06a4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 355, 356, 1, 24, 0x58ec06e4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 356, 357, 1, 24, 0x4ac00625, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 357, 358, 1, 24, 0x4f800665, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 358, 359, 1, 24, 0x544006a5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 359, 360, 1, 24, 0x590006e5, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 360, 361, 1, 24, 0x4ad40626, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 361, 362, 1, 24, 0x4f940666, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 362, 363, 1, 24, 0x545406a6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 363, 364, 1, 24, 0x591406e6, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 364, 365, 1, 24, 0x4ae80627, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 365, 366, 1, 24, 0x4fa80667, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 366, 367, 1, 24, 0x546806a7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 367, 368, 1, 24, 0x592806e7, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 368, 369, 1, 57, 0x9b930fc1, S=1, Quality stats, 8, 0x05ec00be +0, 369, 370, 1, 24, 0x4f1c0660, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 370, 371, 1, 24, 0x53dc06a0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 371, 372, 1, 24, 0x589c06e0, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 372, 373, 1, 24, 0x4a700621, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 373, 374, 1, 24, 0x4f300661, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 374, 375, 1, 24, 0x53f006a1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 375, 376, 1, 24, 0x58b006e1, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 376, 377, 1, 24, 0x4a840622, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 377, 378, 1, 24, 0x4f440662, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 378, 379, 1, 24, 0x540406a2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 379, 380, 1, 24, 0x58c406e2, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 380, 381, 1, 24, 0x4a980623, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 381, 382, 1, 24, 0x4f580663, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 382, 383, 1, 24, 0x541806a3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 383, 384, 1, 24, 0x58d806e3, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 384, 385, 1, 24, 0x4aac0624, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 385, 386, 1, 24, 0x4f6c0664, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 386, 387, 1, 24, 0x542c06a4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 387, 388, 1, 24, 0x58ec06e4, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 388, 389, 1, 24, 0x4ac00625, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 389, 390, 1, 24, 0x4f800665, F=0x0, S=1, Quality stats, 8, 0x076800ee +0, 390, 391, 1, 24, 0x544006a5, F=0x0, S=1, Quality stats, 8, 0x076800ee commit 540aacf7591c92514a62d86d5441c82ded3ccafc Author: Zhao Zhili <quinkblack(a)foxmail.com> AuthorDate: Fri Nov 28 11:17:05 2025 +0800 Commit: Zhao Zhili <quink(a)noreply.code.ffmpeg.org> CommitDate: Tue Dec 2 03:03:55 2025 +0000 fftools/ffmpeg: add force key frame by scdet metadata support For example: ./ffmpeg -hwaccel videotoolbox \ -i input.mp4 -c:a copy \ -vf scdet=threshold=10 \ -c:v h264_videotoolbox \ -force_key_frames scd_metadata \ -g 1000 -t 30 output.mp4 diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 3daf2f7ec2..2dae6632bc 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1665,6 +1665,7 @@ Force video tag/fourcc. This is an alias for @code{-tag:v}. @item -force_key_frames[:@var{stream_specifier}] @var{time}[,@var{time}...] (@emph{output,per-stream}) @item -force_key_frames[:@var{stream_specifier}] expr:@var{expr} (@emph{output,per-stream}) @item -force_key_frames[:@var{stream_specifier}] source (@emph{output,per-stream}) +@item -force_key_frames[:@var{stream_specifier}] scd_metadata (@emph{output,per-stream}) @var{force_key_frames} can take arguments of the following form: @@ -1728,6 +1729,14 @@ the current frame being encoded is marked as a key frame in its source. In cases where this particular source frame has to be dropped, enforce the next available frame to become a key frame instead. +@item scd_metadata +If the argument is @code{scd_metadata}, ffmpeg will force a key frame if +the current frame contains a metadata entry with the key @code{lavfi.scd.time}. +The metadata can be added by filters like @code{scdet} and @code{scdet_vulkan}. +Avoid inserting filters that duplicate frames after @code{scdet}, as this can +cause duplicate metadata for multiple frames and repeated insertion of key +frames. + @end table Note that forcing too many keyframes is very harmful for the lookahead diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index cc2ea1a56e..7720dd9c59 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -602,6 +602,8 @@ enum { #if FFMPEG_OPT_FORCE_KF_SOURCE_NO_DROP KF_FORCE_SOURCE_NO_DROP = 2, #endif + // force keyframe if lavfi.scd.time metadata is set + KF_FORCE_SCD_METADATA = 3, }; typedef struct KeyframeForceCtx { diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 8f07a10848..0f7d961472 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -768,6 +768,9 @@ static enum AVPictureType forced_kf_apply(void *logctx, KeyframeForceCtx *kf, } } else if (kf->type == KF_FORCE_SOURCE && (frame->flags & AV_FRAME_FLAG_KEY)) { goto force_keyframe; + } else if (kf->type == KF_FORCE_SCD_METADATA && + av_dict_get(frame->metadata, "lavfi.scd.time", NULL, 0)) { + goto force_keyframe; } return AV_PICTURE_TYPE_NONE; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index bcbbee9126..194a87875d 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -3279,6 +3279,8 @@ static int process_forced_keyframes(Muxer *mux, const OptionsContext *o) "-force_key_frames is deprecated, use just 'source'\n"); ost->kf.type = KF_FORCE_SOURCE; #endif + } else if (!strcmp(forced_keyframes, "scd_metadata")) { + ost->kf.type = KF_FORCE_SCD_METADATA; } else { int ret = parse_forced_key_frames(ost, &ost->kf, mux, forced_keyframes); if (ret < 0) ----------------------------------------------------------------------- Summary of changes: doc/ffmpeg.texi | 9 + fftools/ffmpeg.h | 2 + fftools/ffmpeg_enc.c | 3 + fftools/ffmpeg_mux_init.c | 2 + tests/fate/ffmpeg.mak | 9 +- ...frames-source => force_key_frames-scd_metadata} | 370 ++++++++++----------- 6 files changed, 208 insertions(+), 187 deletions(-) copy tests/ref/fate/{force_key_frames-source => force_key_frames-scd_metadata} (71%) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 27e94281d1 libavdevice/decklink: add support for DeckLink SDK 14.3
by ffmpeg-git＠ffmpeg.org 01 Dec '25

01 Dec '25

The branch, master has been updated via 27e94281d1c880b4cae28738e35c0d6f9a58f06b (commit) from 1e90047fe6dae4abf19351d678819bd29b41be0e (commit) - Log ----------------------------------------------------------------- commit 27e94281d1c880b4cae28738e35c0d6f9a58f06b Author: Thomas Gritzan <phygon(a)gmx.de> AuthorDate: Thu Nov 27 02:30:25 2025 +0100 Commit: Marton Balint <cus(a)passwd.hu> CommitDate: Mon Dec 1 21:37:12 2025 +0000 libavdevice/decklink: add support for DeckLink SDK 14.3 This patch adds support for DeckLink SDK 14.3 and newer by using the legacy interfaces in the header <DeckLinkAPI_v14_2_1.h>. The missing QueryInterface implementations are also provided. diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index 47de7ef6b0..fe187cd2c9 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -25,7 +25,12 @@ extern "C" { #include "libavformat/internal.h" } +#include <DeckLinkAPIVersion.h> #include <DeckLinkAPI.h> +#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0e030000 +#include <DeckLinkAPI_v14_2_1.h> +#endif + #ifdef _WIN32 #include <DeckLinkAPI_i.c> #else @@ -512,8 +517,8 @@ int ff_decklink_list_devices(AVFormatContext *avctx, return AVERROR(EIO); while (ret == 0 && iter->Next(&dl) == S_OK) { - IDeckLinkOutput *output_config; - IDeckLinkInput *input_config; + IDeckLinkOutput_v14_2_1 *output_config; + IDeckLinkInput_v14_2_1 *input_config; const char *display_name = NULL; const char *unique_name = NULL; AVDeviceInfo *new_device = NULL; @@ -527,14 +532,14 @@ int ff_decklink_list_devices(AVFormatContext *avctx, goto next; if (show_outputs) { - if (dl->QueryInterface(IID_IDeckLinkOutput, (void **)&output_config) == S_OK) { + if (dl->QueryInterface(IID_IDeckLinkOutput_v14_2_1, (void **)&output_config) == S_OK) { output_config->Release(); add = 1; } } if (show_inputs) { - if (dl->QueryInterface(IID_IDeckLinkInput, (void **)&input_config) == S_OK) { + if (dl->QueryInterface(IID_IDeckLinkInput_v14_2_1, (void **)&input_config) == S_OK) { input_config->Release(); add = 1; } diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index 6b32dc2d09..095b438bce 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -29,6 +29,23 @@ #define IDeckLinkProfileAttributes IDeckLinkAttributes #endif +#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0e030000 +#define IDeckLinkInput_v14_2_1 IDeckLinkInput +#define IDeckLinkInputCallback_v14_2_1 IDeckLinkInputCallback +#define IDeckLinkMemoryAllocator_v14_2_1 IDeckLinkMemoryAllocator +#define IDeckLinkOutput_v14_2_1 IDeckLinkOutput +#define IDeckLinkVideoFrame_v14_2_1 IDeckLinkVideoFrame +#define IDeckLinkVideoInputFrame_v14_2_1 IDeckLinkVideoInputFrame +#define IDeckLinkVideoOutputCallback_v14_2_1 IDeckLinkVideoOutputCallback +#define IID_IDeckLinkInput_v14_2_1 IID_IDeckLinkInput +#define IID_IDeckLinkInputCallback_v14_2_1 IID_IDeckLinkInputCallback +#define IID_IDeckLinkMemoryAllocator_v14_2_1 IID_IDeckLinkMemoryAllocator +#define IID_IDeckLinkOutput_v14_2_1 IID_IDeckLinkOutput +#define IID_IDeckLinkVideoFrame_v14_2_1 IID_IDeckLinkVideoFrame +#define IID_IDeckLinkVideoInputFrame_v14_2_1 IID_IDeckLinkVideoInputFrame +#define IID_IDeckLinkVideoOutputCallback_v14_2_1 IID_IDeckLinkVideoOutputCallback +#endif + extern "C" { #include "libavutil/mem.h" #include "libavcodec/packet_internal.h" @@ -76,6 +93,16 @@ static char *dup_cfstring_to_utf8(CFStringRef w) #define DECKLINK_FREE(s) free((void *) s) #endif +#ifdef _WIN32 +#include <guiddef.h> // REFIID, IsEqualIID() +#define DECKLINK_IsEqualIID IsEqualIID +#else +static inline bool DECKLINK_IsEqualIID(const REFIID& riid1, const REFIID& riid2) +{ + return memcmp(&riid1, &riid2, sizeof(REFIID)) == 0; +} +#endif + class decklink_output_callback; class decklink_input_callback; @@ -93,8 +120,8 @@ typedef struct DecklinkPacketQueue { struct decklink_ctx { /* DeckLink SDK interfaces */ IDeckLink *dl; - IDeckLinkOutput *dlo; - IDeckLinkInput *dli; + IDeckLinkOutput_v14_2_1 *dlo; + IDeckLinkInput_v14_2_1 *dli; IDeckLinkConfiguration *cfg; IDeckLinkProfileAttributes *attr; decklink_output_callback *output_callback; diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 418701e4e0..8830779990 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -31,7 +31,11 @@ extern "C" { #include "libavformat/internal.h" } +#include <DeckLinkAPIVersion.h> #include <DeckLinkAPI.h> +#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0e030000 +#include <DeckLinkAPI_v14_2_1.h> +#endif extern "C" { #include "config.h" @@ -105,7 +109,7 @@ static VANCLineNumber vanc_line_numbers[] = { {bmdModeUnknown, 0, -1, -1, -1} }; -class decklink_allocator : public IDeckLinkMemoryAllocator +class decklink_allocator : public IDeckLinkMemoryAllocator_v14_2_1 { public: decklink_allocator(): _refs(1) { } @@ -129,7 +133,21 @@ public: virtual HRESULT STDMETHODCALLTYPE Decommit() { return S_OK; } // IUnknown methods - virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; } + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID *ppv) + { + if (DECKLINK_IsEqualIID(riid, IID_IUnknown)) { + *ppv = static_cast<IUnknown*>(this); + } else if (DECKLINK_IsEqualIID(riid, IID_IDeckLinkMemoryAllocator_v14_2_1)) { + *ppv = static_cast<IDeckLinkMemoryAllocator_v14_2_1*>(this); + } else { + *ppv = NULL; + return E_NOINTERFACE; + } + + AddRef(); + return S_OK; + } + virtual ULONG STDMETHODCALLTYPE AddRef(void) { return ++_refs; } virtual ULONG STDMETHODCALLTYPE Release(void) { @@ -472,7 +490,7 @@ skip_packet: } -static void handle_klv(AVFormatContext *avctx, decklink_ctx *ctx, IDeckLinkVideoInputFrame *videoFrame, int64_t pts) +static void handle_klv(AVFormatContext *avctx, decklink_ctx *ctx, IDeckLinkVideoInputFrame_v14_2_1 *videoFrame, int64_t pts) { const uint8_t KLV_DID = 0x44; const uint8_t KLV_IN_VANC_SDID = 0x04; @@ -574,17 +592,30 @@ static void handle_klv(AVFormatContext *avctx, decklink_ctx *ctx, IDeckLinkVideo } } -class decklink_input_callback : public IDeckLinkInputCallback +class decklink_input_callback : public IDeckLinkInputCallback_v14_2_1 { public: explicit decklink_input_callback(AVFormatContext *_avctx); ~decklink_input_callback(); - virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; } + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID *ppv) + { + if (DECKLINK_IsEqualIID(riid, IID_IUnknown)) { + *ppv = static_cast<IUnknown*>(this); + } else if (DECKLINK_IsEqualIID(riid, IID_IDeckLinkInputCallback_v14_2_1)) { + *ppv = static_cast<IDeckLinkInputCallback_v14_2_1*>(this); + } else { + *ppv = NULL; + return E_NOINTERFACE; + } + + AddRef(); + return S_OK; + } virtual ULONG STDMETHODCALLTYPE AddRef(void); virtual ULONG STDMETHODCALLTYPE Release(void); virtual HRESULT STDMETHODCALLTYPE VideoInputFormatChanged(BMDVideoInputFormatChangedEvents, IDeckLinkDisplayMode*, BMDDetectedVideoInputFormatFlags); - virtual HRESULT STDMETHODCALLTYPE VideoInputFrameArrived(IDeckLinkVideoInputFrame*, IDeckLinkAudioInputPacket*); + virtual HRESULT STDMETHODCALLTYPE VideoInputFrameArrived(IDeckLinkVideoInputFrame_v14_2_1*, IDeckLinkAudioInputPacket*); private: std::atomic<int> _refs; @@ -593,7 +624,7 @@ private: int no_video; int64_t initial_video_pts; int64_t initial_audio_pts; - IDeckLinkVideoInputFrame* last_video_frame; + IDeckLinkVideoInputFrame_v14_2_1* last_video_frame; }; decklink_input_callback::decklink_input_callback(AVFormatContext *_avctx) : _refs(1) @@ -625,7 +656,7 @@ ULONG decklink_input_callback::Release(void) return ret; } -static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame, +static int64_t get_pkt_pts(IDeckLinkVideoInputFrame_v14_2_1 *videoFrame, IDeckLinkAudioInputPacket *audioFrame, int64_t wallclock, int64_t abs_wallclock, @@ -679,7 +710,7 @@ static int64_t get_pkt_pts(IDeckLinkVideoInputFrame *videoFrame, return pts; } -static int get_bmd_timecode(AVFormatContext *avctx, AVTimecode *tc, AVRational frame_rate, BMDTimecodeFormat tc_format, IDeckLinkVideoInputFrame *videoFrame) +static int get_bmd_timecode(AVFormatContext *avctx, AVTimecode *tc, AVRational frame_rate, BMDTimecodeFormat tc_format, IDeckLinkVideoInputFrame_v14_2_1 *videoFrame) { IDeckLinkTimecode *timecode; int ret = AVERROR(ENOENT); @@ -701,7 +732,7 @@ static int get_bmd_timecode(AVFormatContext *avctx, AVTimecode *tc, AVRational f return ret; } -static int get_frame_timecode(AVFormatContext *avctx, decklink_ctx *ctx, AVTimecode *tc, IDeckLinkVideoInputFrame *videoFrame) +static int get_frame_timecode(AVFormatContext *avctx, decklink_ctx *ctx, AVTimecode *tc, IDeckLinkVideoInputFrame_v14_2_1 *videoFrame) { AVRational frame_rate = ctx->video_st->r_frame_rate; int ret; @@ -726,7 +757,7 @@ static int get_frame_timecode(AVFormatContext *avctx, decklink_ctx *ctx, AVTimec } HRESULT decklink_input_callback::VideoInputFrameArrived( - IDeckLinkVideoInputFrame *videoFrame, IDeckLinkAudioInputPacket *audioFrame) + IDeckLinkVideoInputFrame_v14_2_1 *videoFrame, IDeckLinkAudioInputPacket *audioFrame) { void *frameBytes; void *audioFrameBytes; @@ -1141,7 +1172,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) goto error; /* Get input device. */ - if (ctx->dl->QueryInterface(IID_IDeckLinkInput, (void **) &ctx->dli) != S_OK) { + if (ctx->dl->QueryInterface(IID_IDeckLinkInput_v14_2_1, (void **) &ctx->dli) != S_OK) { av_log(avctx, AV_LOG_ERROR, "Could not open input device from '%s'\n", avctx->url); ret = AVERROR(EIO); diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 195f005c17..d2e246c818 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -28,7 +28,11 @@ extern "C" { #include "libavformat/internal.h" } +#include <DeckLinkAPIVersion.h> #include <DeckLinkAPI.h> +#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0e030000 +#include <DeckLinkAPI_v14_2_1.h> +#endif extern "C" { #include "libavformat/avformat.h" @@ -47,18 +51,8 @@ extern "C" { #include "libklvanc/pixels.h" #endif -#ifdef _WIN32 -#include <guiddef.h> -#else -/* There is no guiddef.h in Linux builds, so we provide our own IsEqualIID() */ -static bool IsEqualIID(REFIID riid1, REFIID riid2) -{ - return memcmp(&riid1, &riid2, sizeof(REFIID)) == 0; -} -#endif - /* DeckLink callback class declaration */ -class decklink_frame : public IDeckLinkVideoFrame +class decklink_frame : public IDeckLinkVideoFrame_v14_2_1 { public: decklink_frame(struct decklink_ctx *ctx, AVFrame *avframe, AVCodecID codec_id, int height, int width) : @@ -123,10 +117,10 @@ public: } virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID *ppv) { - if (IsEqualIID(riid, IID_IUnknown)) { + if (DECKLINK_IsEqualIID(riid, IID_IUnknown)) { *ppv = static_cast<IUnknown*>(this); - } else if (IsEqualIID(riid, IID_IDeckLinkVideoFrame)) { - *ppv = static_cast<IDeckLinkVideoFrame*>(this); + } else if (DECKLINK_IsEqualIID(riid, IID_IDeckLinkVideoFrame_v14_2_1)) { + *ppv = static_cast<IDeckLinkVideoFrame_v14_2_1*>(this); } else { *ppv = NULL; return E_NOINTERFACE; @@ -135,7 +129,6 @@ public: AddRef(); return S_OK; } - virtual ULONG STDMETHODCALLTYPE AddRef(void) { return ++_refs; } virtual ULONG STDMETHODCALLTYPE Release(void) { @@ -162,10 +155,10 @@ private: std::atomic<int> _refs; }; -class decklink_output_callback : public IDeckLinkVideoOutputCallback +class decklink_output_callback : public IDeckLinkVideoOutputCallback_v14_2_1 { public: - virtual HRESULT STDMETHODCALLTYPE ScheduledFrameCompleted(IDeckLinkVideoFrame *_frame, BMDOutputFrameCompletionResult result) + virtual HRESULT STDMETHODCALLTYPE ScheduledFrameCompleted(IDeckLinkVideoFrame_v14_2_1 *_frame, BMDOutputFrameCompletionResult result) { decklink_frame *frame = static_cast<decklink_frame *>(_frame); struct decklink_ctx *ctx = frame->_ctx; @@ -183,7 +176,20 @@ public: return S_OK; } virtual HRESULT STDMETHODCALLTYPE ScheduledPlaybackHasStopped(void) { return S_OK; } - virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; } + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID *ppv) + { + if (DECKLINK_IsEqualIID(riid, IID_IUnknown)) { + *ppv = static_cast<IUnknown*>(this); + } else if (DECKLINK_IsEqualIID(riid, IID_IDeckLinkVideoOutputCallback_v14_2_1)) { + *ppv = static_cast<IDeckLinkVideoOutputCallback_v14_2_1*>(this); + } else { + *ppv = NULL; + return E_NOINTERFACE; + } + + AddRef(); + return S_OK; + } virtual ULONG STDMETHODCALLTYPE AddRef(void) { return 1; } virtual ULONG STDMETHODCALLTYPE Release(void) { return 1; } }; @@ -763,7 +769,7 @@ static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt) ctx->first_pts = pkt->pts; /* Schedule frame for playback. */ - hr = ctx->dlo->ScheduleVideoFrame((class IDeckLinkVideoFrame *) frame, + hr = ctx->dlo->ScheduleVideoFrame(frame, pkt->pts * ctx->bmd_tb_num, ctx->bmd_tb_num, ctx->bmd_tb_den); /* Pass ownership to DeckLink, or release on failure */ @@ -898,7 +904,7 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) return ret; /* Get output device. */ - if (ctx->dl->QueryInterface(IID_IDeckLinkOutput, (void **) &ctx->dlo) != S_OK) { + if (ctx->dl->QueryInterface(IID_IDeckLinkOutput_v14_2_1, (void **) &ctx->dlo) != S_OK) { av_log(avctx, AV_LOG_ERROR, "Could not open output device from '%s'\n", avctx->url); ret = AVERROR(EIO); ----------------------------------------------------------------------- Summary of changes: libavdevice/decklink_common.cpp | 13 +++++++--- libavdevice/decklink_common.h | 31 +++++++++++++++++++++-- libavdevice/decklink_dec.cpp | 55 ++++++++++++++++++++++++++++++++--------- libavdevice/decklink_enc.cpp | 46 +++++++++++++++++++--------------- 4 files changed, 107 insertions(+), 38 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch release/8.0 updated. dc8af5879d avcodec/prores_raw: add missing includes
by ffmpeg-git＠ffmpeg.org 01 Dec '25

01 Dec '25

The branch, release/8.0 has been updated via dc8af5879d98f922281ced1a7067caa35267e8f5 (commit) via 2b061b58f9e53e5070411a0c47c74fa78bfe995e (commit) via 0fc28b271c81a39e7efb3256f78d7c6adc99869a (commit) via bd4660ed92b2ce245f36ac264c1c052077550930 (commit) via 92c8e0c201b06ef17ca19b08e2383514577f4d1a (commit) from 27a297f1866d13c51a18648469f347177124d3ac (commit) - Log ----------------------------------------------------------------- commit dc8af5879d98f922281ced1a7067caa35267e8f5 Author: Kacper Michajłow <kasper93(a)gmail.com> AuthorDate: Sat Aug 9 02:48:35 2025 +0200 Commit: Timo Rothenpieler <timo(a)rothenpieler.org> CommitDate: Sun Nov 30 17:39:10 2025 +0100 avcodec/prores_raw: add missing includes Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> (cherry picked from commit eec391993e447aaa9b8da38c5daaa4c31849d10f) diff --git a/libavcodec/prores_raw.h b/libavcodec/prores_raw.h index 9f370303d4..3ac8068dd5 100644 --- a/libavcodec/prores_raw.h +++ b/libavcodec/prores_raw.h @@ -22,7 +22,9 @@ #ifndef AVCODEC_PRORES_RAW_H #define AVCODEC_PRORES_RAW_H +#include "libavutil/frame.h" #include "libavutil/mem_internal.h" +#include "libavutil/pixfmt.h" #include "bytestream.h" #include "blockdsp.h" commit 2b061b58f9e53e5070411a0c47c74fa78bfe995e Author: Kacper Michajłow <kasper93(a)gmail.com> AuthorDate: Sat Aug 9 05:38:20 2025 +0200 Commit: Timo Rothenpieler <timo(a)rothenpieler.org> CommitDate: Sun Nov 30 17:37:28 2025 +0100 avfilter/stack_internal: fix checkheaders test Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> (cherry picked from commit 1a1377c53decf1264ca255910124caae82fd63a0) diff --git a/libavfilter/stack_internal.h b/libavfilter/stack_internal.h index ace8886152..b4f9b92223 100644 --- a/libavfilter/stack_internal.h +++ b/libavfilter/stack_internal.h @@ -19,6 +19,10 @@ #ifndef AVFILTER_STACK_INTERNAL_H #define AVFILTER_STACK_INTERNAL_H +#ifdef HWContext + +#include "libavfilter/framesync.h" + enum { STACK_H = 0, STACK_V = 1, @@ -57,4 +61,6 @@ static int stack_init(AVFilterContext *avctx); static av_cold void stack_uninit(AVFilterContext *avctx); static int stack_activate(AVFilterContext *avctx); +#endif + #endif /* AVFILTER_STACK_INTERNAL_H */ commit 0fc28b271c81a39e7efb3256f78d7c6adc99869a Author: Timo Rothenpieler <timo(a)rothenpieler.org> AuthorDate: Sun Nov 30 16:59:37 2025 +0100 Commit: Timo Rothenpieler <timo(a)rothenpieler.org> CommitDate: Sun Nov 30 16:59:37 2025 +0100 forgejo: apply needed CI changes for 8.0 diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index f203b17a56..e3876dc899 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -58,7 +58,7 @@ jobs: strategy: fail-fast: false matrix: - image: ["ghcr.io/btbn/ffmpeg-builds/win64-gpl:latest"] + image: ["ghcr.io/btbn/ffmpeg-builds/win64-gpl-8.0:latest"] runs-on: linux-amd64 container: ${{ matrix.image }} steps: commit bd4660ed92b2ce245f36ac264c1c052077550930 Author: Timo Rothenpieler <timo(a)rothenpieler.org> AuthorDate: Sun Nov 30 16:44:36 2025 +0100 Commit: Timo Rothenpieler <timo(a)rothenpieler.org> CommitDate: Sun Nov 30 16:44:36 2025 +0100 forgejo/workflows: run tests on correct release branch diff --git a/.forgejo/workflows/lint.yml b/.forgejo/workflows/lint.yml index 42e925ad8b..c2ea5050f1 100644 --- a/.forgejo/workflows/lint.yml +++ b/.forgejo/workflows/lint.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - release/8.0 pull_request: jobs: diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 799d2c356a..f203b17a56 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - release/8.0 pull_request: jobs: commit 92c8e0c201b06ef17ca19b08e2383514577f4d1a Author: Timo Rothenpieler <timo(a)rothenpieler.org> AuthorDate: Sun Nov 30 16:42:51 2025 +0100 Commit: Timo Rothenpieler <timo(a)rothenpieler.org> CommitDate: Sun Nov 30 16:42:51 2025 +0100 forgejo: backport CI changes to release/8.0 diff --git a/.forgejo/pre-commit/config.yaml b/.forgejo/pre-commit/config.yaml index 9a7041543f..f1ab7765ef 100644 --- a/.forgejo/pre-commit/config.yaml +++ b/.forgejo/pre-commit/config.yaml @@ -18,6 +18,14 @@ repos: - id: fix-byte-order-marker - id: mixed-line-ending - id: trailing-whitespace +- repo: local + hooks: + - id: aarch64-asm-indent + name: fix aarch64 assembly indentation + files: ^.*/aarch64/.*\.S$ + language: script + entry: ./tools/check_arm_indent.sh --apply + pass_filenames: false - repo: https://github.com/codespell-project/codespell rev: v2.4.1 hooks: diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 56e844ff4b..799d2c356a 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -9,13 +9,28 @@ jobs: strategy: fail-fast: false matrix: - runner: [linux-amd64,linux-aarch64] + runner: [linux-aarch64] + shared: ['static'] + bits: ['64'] + include: + - runner: linux-amd64 + shared: 'static' + bits: '32' + - runner: linux-amd64 + shared: 'shared' + bits: '64' runs-on: ${{ matrix.runner }} steps: - name: Checkout uses: actions/checkout@v4 - name: Configure - run: ./configure --enable-gpl --enable-nonfree --enable-memory-poisoning --assert-level=2 + run: | + ./configure --enable-gpl --enable-nonfree --enable-memory-poisoning --assert-level=2 \ + $([ "${{ matrix.bits }}" != "32" ] || echo --arch=x86_32 --extra-cflags=-m32 --extra-cxxflags=-m32 --extra-ldflags=-m32) \ + $([ "${{ matrix.shared }}" != "shared" ] || echo --enable-shared --disable-static) \ + || CFGRES=$? && CFGRES=$? + cat ffbuild/config.log + exit $CFGRES - name: Build run: make -j$(nproc) - name: Restore Cached Fate-Suite @@ -30,7 +45,7 @@ jobs: id: fate run: | make fate-rsync SAMPLES=$PWD/fate-suite - echo "hash=$(find fate-suite -type f | sort | sha256sum | cut -d' ' -f1)" >> $FORGEJO_OUTPUT + echo "hash=$(find fate-suite -type f -printf "%P %s %T@\n" | sort | sha256sum | cut -d' ' -f1)" >> $FORGEJO_OUTPUT - name: Cache Fate-Suite uses: actions/cache/save@v4 if: ${{ format('fate-suite-{0}', steps.fate.outputs.hash) != steps.cache.outputs.cache-matched-key }} @@ -38,7 +53,7 @@ jobs: path: fate-suite key: fate-suite-${{ steps.fate.outputs.hash }} - name: Run Fate - run: make fate SAMPLES=$PWD/fate-suite -j$(nproc) + run: LD_LIBRARY_PATH="$(printf "%s:" "$PWD"/lib*)$PWD" make fate fate-build SAMPLES=$PWD/fate-suite -j$(nproc) compile_only: strategy: fail-fast: false @@ -57,3 +72,5 @@ jobs: --extra-libs="$FF_LIBS" --extra-ldflags="$FF_LDFLAGS" --extra-ldexeflags="$FF_LDEXEFLAGS" - name: Build run: make -j$(nproc) + - name: Run Fate + run: make -j$(nproc) fate-build diff --git a/tools/check_arm_indent.sh b/tools/check_arm_indent.sh new file mode 100755 index 0000000000..5becfe0aec --- /dev/null +++ b/tools/check_arm_indent.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# +# Copyright (c) 2025 Martin Storsjo +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +cd $(dirname $0)/.. + +if [ "$1" = "--apply" ]; then + apply=1 +fi + +ret=0 + +for i in */aarch64/*.S */aarch64/*/*.S; do + case $i in + libavcodec/aarch64/h264idct_neon.S|libavcodec/aarch64/h26x/epel_neon.S|libavcodec/aarch64/h26x/qpel_neon.S|libavcodec/aarch64/vc1dsp_neon.S) + # Skip files with known (and tolerated) deviations from the tool. + continue + esac + ./tools/indent_arm_assembly.pl < "$i" > tmp.S || ret=$? + if ! git diff --quiet --no-index "$i" tmp.S; then + if [ -n "$apply" ]; then + mv tmp.S "$i" + else + git --no-pager diff --no-index "$i" tmp.S + fi + ret=1 + fi +done + +rm -f tmp.S + +exit $ret diff --git a/tools/indent_arm_assembly.pl b/tools/indent_arm_assembly.pl new file mode 100755 index 0000000000..359c2bcf4f --- /dev/null +++ b/tools/indent_arm_assembly.pl @@ -0,0 +1,243 @@ +#!/usr/bin/env perl +# +# Copyright (c) 2025 Martin Storsjo +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +# A script for reformatting ARM/AArch64 assembly according to the following +# style: +# - Instructions start after 8 columns, operands start after 24 columns +# - Vector register layouts and modifiers like "uxtw" are written in lowercase +# - Optionally align operand columns vertically according to their +# maximum width (accommodating for e.g. x0 vs x10, or v0.8b vs v16.16b). +# +# The script can be executed as "indent_arm_assembly.pl file [outfile]". +# If no outfile is specified, the given file is overwritten in place. +# +# Alternatively, the if no file parameters are given, the script reads input +# code on stdin, and outputs the reformatted code on stdout. + +use strict; + +my $indent_operands = 0; +my $instr_indent = 8; +my $operand_indent = 24; +my $match_indent = 0; +my $file; +my $outfile; + +while (@ARGV) { + my $opt = shift; + + if ($opt eq "-operands") { + $indent_operands = 1; + } elsif ($opt eq "-indent") { + $instr_indent = shift; + } elsif ($opt eq "-operand-indent") { + $operand_indent = shift; + } elsif ($opt eq "-match-indent") { + $match_indent = 1; + } else { + if (!$file) { + $file = $opt; + } elsif (!$outfile) { + $outfile = $opt; + } else { + die "Unrecognized parameter $opt\n"; + } + } +} + +if ($operand_indent < $instr_indent) { + die "Can't indent operands to $operand_indent while indenting " . + "instructions to $instr_indent\n"; +} + +# Return a string consisting of n spaces +sub spaces { + my $n = $_[0]; + return " " x $n; +} + +sub indentcolumns { + my $input = $_[0]; + my $chars = $_[1]; + my @operands = split(/,/, $input); + my $num = @operands; + my $ret = ""; + for (my $i = 0; $i < $num; $i++) { + my $cur = $operands[$i]; + # Trim out leading/trailing whitespace + $cur =~ s/^\s+|\s+$//g; + $ret .= $cur; + if ($i + 1 < $num) { + # If we have a following operand, add a comma and whitespace to + # align the next operand. + my $next = $operands[$i+1]; + my $len = length($cur); + if ($len > $chars) { + # If this operand was too wide for the intended column width, + # don't try to realign the line at all, just return the input + # untouched. + return $input; + } + my $pad = $chars - $len; + if ($next =~ /[su]xt[bhw]|[la]s[lr]/) { + # If the next item isn't a regular operand, but a modifier, + # don't try to align that. E.g. "add x0, x0, w1, uxtw #1". + $pad = 0; + } + $ret .= "," . spaces(1 + $pad); + } + } + return $ret; +} + +# Realign the operands part of an instruction line, making each operand +# take up the maximum width for that kind of operand. +sub columns { + my $rest = $_[0]; + if ($rest !~ /,/) { + # No commas, no operands to split and align + return $rest; + } + if ($rest =~ /{|[^\w]\[/) { + # Check for instructions that use register ranges, like {v0.8b,v1.8b} + # or mem address operands, like "ldr x0, [sp]" - we skip trying to + # realign these. + return $rest; + } + if ($rest =~ /v[0-9]+\.[0-9]+[bhsd]/) { + # If we have references to aarch64 style vector registers, like + # v0.8b, then align all operands to the maximum width of such + # operands - v16.16b. + # + # TODO: Ideally, we'd handle mixed operand types individually. + return indentcolumns($rest, 7); + } + # Indent operands according to the maximum width of regular registers, + # like x10. + return indentcolumns($rest, 3); +} + +my $in; +my $out; +my $tempfile; + +if ($file) { + open(INPUT, "$file") or die "Unable to open $file: $!"; + $in = *INPUT; + if ($outfile) { + open(OUTPUT, ">$outfile") or die "Unable to open $outfile: $!"; + } else { + $tempfile = "$file.tmp"; + open(OUTPUT, ">$tempfile") or die "Unable to open $tempfile: $!"; + } + $out = *OUTPUT; +} else { + $in = *STDIN; + $out = *STDOUT; +} + +while (<$in>) { + # Trim off trailing whitespace. + chomp; + if (/^([\.\w\d]+:)?(\s+)([\w\\][\w\\\.]*)(?:(\s+)(.*)|$)/) { + my $label = $1; + my $indent = $2; + my $instr = $3; + my $origspace = $4; + my $rest = $5; + + my $orig_operand_indent = length($label) + length($indent) + + length($instr) + length($origspace); + + if ($indent_operands) { + $rest = columns($rest); + } + + my $size = $instr_indent; + if ($match_indent) { + # Try to check the current attempted indent size and normalize + # to it; match existing ident sizes of 4, 8, 10 and 12 columns. + my $cur_indent = length($label) + length($indent); + if ($cur_indent >= 3 && $cur_indent <= 5) { + $size = 4; + } elsif ($cur_indent >= 7 && $cur_indent <= 9) { + $size = 8; + } elsif ($cur_indent == 10 || $cur_indent == 12) { + $size = $cur_indent; + } + } + if (length($label) >= $size) { + # Not enough space for the label; just add a space between the label + # and the instruction. + $indent = " "; + } else { + $indent = spaces($size - length($label)); + } + + my $instr_end = length($label) + length($indent) + length($instr); + $size = $operand_indent - $instr_end; + if ($match_indent) { + # Check how the operands currently seem to be indented. + my $cur_indent = $orig_operand_indent; + if ($cur_indent >= 11 && $cur_indent <= 13) { + $size = 12; + } elsif ($cur_indent >= 14 && $cur_indent <= 17) { + $size = 16; + } elsif ($cur_indent >= 18 && $cur_indent <= 22) { + $size = 20; + } elsif ($cur_indent >= 23 && $cur_indent <= 27) { + $size = 24; + } + $size -= $instr_end; + } + my $operand_space = " "; + if ($size > 0) { + $operand_space = spaces($size); + } + + # Lowercase the aarch64 vector layout description, .8B -> .8b + $rest =~ s/(\.[84216]*[BHSD])/lc($1)/ge; + # Lowercase modifiers like "uxtw" or "lsl" + $rest =~ s/([SU]XT[BWH]|[LA]S[LR])/lc($1)/ge; + + # Reassemble the line + if ($rest eq "") { + $_ = $label . $indent . $instr; + } else { + $_ = $label . $indent . $instr . $operand_space . $rest; + } + } + print $out $_ . "\n"; +} + +if ($file) { + close(INPUT); + close(OUTPUT); +} +if ($tempfile) { + rename($tempfile, $file); +} ----------------------------------------------------------------------- Summary of changes: .forgejo/pre-commit/config.yaml | 8 ++ .forgejo/workflows/lint.yml | 2 +- .forgejo/workflows/test.yml | 29 ++++- libavcodec/prores_raw.h | 2 + libavfilter/stack_internal.h | 6 + tools/check_arm_indent.sh | 55 +++++++++ tools/indent_arm_assembly.pl | 243 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 338 insertions(+), 7 deletions(-) create mode 100755 tools/check_arm_indent.sh create mode 100755 tools/indent_arm_assembly.pl hooks/post-receive --

1 0

[ffmpeg] branch release/7.1 updated. 292b30bbe0 configure: unbreak glslang build
by ffmpeg-git＠ffmpeg.org 01 Dec '25

01 Dec '25

The branch, release/7.1 has been updated via 292b30bbe01d9aedd02adfe4d8516537a215c5ca (commit) from f65fc0b13754c94d6185b1b18e604b8129d4f774 (commit) - Log ----------------------------------------------------------------- commit 292b30bbe01d9aedd02adfe4d8516537a215c5ca Author: Gyan Doshi <ffmpeg(a)gyani.pro> AuthorDate: Sun Sep 28 13:20:23 2025 +0530 Commit: Marvin Scholz <epirat07(a)gmail.com> CommitDate: Mon Dec 1 16:49:31 2025 +0100 configure: unbreak glslang build Don't unconditionally link to libSPVRemapper which was removed in 16.0 in 3a7f787 diff --git a/configure b/configure index 98b582a5d5..32b920240f 100755 --- a/configure +++ b/configure @@ -6917,12 +6917,16 @@ enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontco enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info enabled libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create -enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \ +if enabled libglslang; then + spvremap="-lSPVRemapper" + require_headers "glslang/build_info.h" && { test_cpp_condition glslang/build_info.h "GLSLANG_VERSION_MAJOR >= 16" && spvremap="" ; } + check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \ -lglslang -lMachineIndependent -lGenericCodeGen \ - -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm || + ${spvremap} -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm || require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \ -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \ - -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ; } + ${spvremap} -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ; +fi enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu || require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do ----------------------------------------------------------------------- Summary of changes: configure | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 1e90047fe6 vulkan: fix host copy stride
by ffmpeg-git＠ffmpeg.org 01 Dec '25

01 Dec '25

The branch, master has been updated via 1e90047fe6dae4abf19351d678819bd29b41be0e (commit) from 7043522fe07b4678de59e01f987de8f2f46d40a2 (commit) - Log ----------------------------------------------------------------- commit 1e90047fe6dae4abf19351d678819bd29b41be0e Author: averne <averne381(a)gmail.com> AuthorDate: Mon Dec 1 15:40:40 2025 +0100 Commit: averne <averne381(a)gmail.com> CommitDate: Mon Dec 1 15:40:40 2025 +0100 vulkan: fix host copy stride memoryRowLength is is texels, not bytes diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index c3322bafbd..89bf39bb3f 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -4382,6 +4382,7 @@ static int vulkan_transfer_host(AVHWFramesContext *hwfc, AVFrame *hwf, FFVulkanFunctions *vk = &p->vkctx.vkfn; AVVkFrame *hwf_vk = (AVVkFrame *)hwf->data[0]; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(swf->format); const int planes = av_pix_fmt_count_planes(swf->format); const int nb_images = ff_vk_count_images(hwf_vk); @@ -4474,7 +4475,7 @@ static int vulkan_transfer_host(AVHWFramesContext *hwfc, AVFrame *hwf, get_plane_wh(&p_w, &p_h, swf->format, swf->width, swf->height, i); region_info.pHostPointer = swf->data[i]; - region_info.memoryRowLength = swf->linesize[i]; + region_info.memoryRowLength = swf->linesize[i] / desc->comp[i].step; region_info.imageSubresource.aspectMask = ff_vk_aspect_flag(hwf, i); region_info.imageExtent = (VkExtent3D){ p_w, p_h, 1 }; copy_info.srcImage = hwf_vk->img[img_idx]; ----------------------------------------------------------------------- Summary of changes: libavutil/hwcontext_vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 7043522fe0 avutil/hwcontext_d3d12va: use hwdev context for logging
by ffmpeg-git＠ffmpeg.org 01 Dec '25

01 Dec '25

The branch, master has been updated via 7043522fe07b4678de59e01f987de8f2f46d40a2 (commit) from 932a872dbc1a300a45b085cd0195ce6ab8e0b3fa (commit) - Log ----------------------------------------------------------------- commit 7043522fe07b4678de59e01f987de8f2f46d40a2 Author: llyyr <llyyr.public(a)gmail.com> AuthorDate: Sat Nov 29 17:03:17 2025 +0530 Commit: Tong Wu <wutong1208(a)outlook.com> CommitDate: Mon Dec 1 03:15:25 2025 +0000 avutil/hwcontext_d3d12va: use hwdev context for logging This fixes warning about av_log being called with NULL AVClass. This is also an API violation Fixes: https://trac.ffmpeg.org/ticket/11335 diff --git a/libavutil/hwcontext_d3d12va.c b/libavutil/hwcontext_d3d12va.c index b80227b56c..164f15a285 100644 --- a/libavutil/hwcontext_d3d12va.c +++ b/libavutil/hwcontext_d3d12va.c @@ -746,7 +746,7 @@ static int d3d12va_device_create(AVHWDeviceContext *hwdev, const char *device, DXGI_ADAPTER_DESC desc; hr = IDXGIAdapter2_GetDesc(pAdapter, &desc); if (!FAILED(hr)) { - av_log(ctx, AV_LOG_INFO, "Using device %04x:%04x (%ls).\n", + av_log(hwdev, AV_LOG_INFO, "Using device %04x:%04x (%ls).\n", desc.VendorId, desc.DeviceId, desc.Description); } } @@ -754,7 +754,7 @@ static int d3d12va_device_create(AVHWDeviceContext *hwdev, const char *device, hr = priv->create_device((IUnknown *)pAdapter, D3D_FEATURE_LEVEL_12_0, &IID_ID3D12Device, (void **)&ctx->device); D3D12_OBJECT_RELEASE(pAdapter); if (FAILED(hr)) { - av_log(ctx, AV_LOG_ERROR, "Failed to create Direct 3D 12 device (%lx)\n", (long)hr); + av_log(hwdev, AV_LOG_ERROR, "Failed to create Direct 3D 12 device (%lx)\n", (long)hr); return AVERROR_UNKNOWN; } } ----------------------------------------------------------------------- Summary of changes: libavutil/hwcontext_d3d12va.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch release/4.4 updated. f63a934407 update for 4.4.7
by ffmpeg-git＠ffmpeg.org 01 Dec '25

01 Dec '25

The branch, release/4.4 has been updated via f63a934407e11ddd48d146d30921dee225a0da05 (commit) via 468e425a23d8ea149f15503ec3a9adbd890b3357 (commit) via 56ff5db7d759b3b33344709b214e68e55a775e10 (commit) via ace015bd43b8e2d73c28e2da2c99f4519296b3ec (commit) via d81116742b1f5962979d710bb26011e3f8eedae7 (commit) via 2eecc2c6e776fb7d1b7f4c8b2c4ead46b6a41065 (commit) via 96fcd37fd03441dbe0187afe1d4f7dd55e146249 (commit) via 0fcf3321f7df99fd806d0a50acfc665a2fabe0c8 (commit) via 96a27bebf5f035d4b3565e03eb1c0fdad1e9b5a4 (commit) via b2f5dd780d97a04bc52948aa42fe18c529c5e3b1 (commit) via 3a850b1e0f51bcd8ef141be1764652af2661b526 (commit) via a40b8f4ee38373f9ee2b182c8d561832ed49f264 (commit) via 8ff2d9606555c0c62f698d54be27080dcf90ceb7 (commit) via 25d9db13cae96d57b7888560a4d750de95cc26ef (commit) via 8d174ecd1047dbd5504b0ce5f9aa1a85fc491ff8 (commit) via 1c4bbca9326817e549d449726ec7a9348d348589 (commit) via 26e3ed6080daffd2cbb14167cb060e94dc15998a (commit) via 447d98b07235c04437e7d3836fc97195a503fe3d (commit) via c20c66499812b85ab3876e746a5474376b6000b1 (commit) via a1a5ab07ee6f04c563e56c576136a500c4ab8a7c (commit) via 0cf474451d51d984ae574754a0ce993faac97526 (commit) via 3798f1b2311946183551ba30e945abda4bf52100 (commit) via c3069227bc1c0ad4acfb9c1c802c1d2f0b077c8a (commit) via 21fe514152a22cc5653fd95f065320adfcf076e9 (commit) via ab45118cc7a78e82f623deaba18e4b4c65973914 (commit) via c9323a8efc144285d85c7602ad87787024b9ea2e (commit) via 9d304b823c9a1e01abf0c6b4f715424840a78f5e (commit) via b39f58aa95a22487402aedcf02f277e1fd30dba0 (commit) via 91aca4595550bd99e025bcaea9aa01deaf1cce0f (commit) via 24531f73d22eaaa072fcc5d19a525fa8e3553a9b (commit) via 2a5e5b9cde94cd48545b613271c3affacd806e60 (commit) via 72973c98b622067f2fe23d53a09703d6b3c46939 (commit) via cf9ac939ce8fdcfeba0876772e5d06b9a12b1152 (commit) via 32a9aae14cd0b6ae3ed56bf11f07e2a6e1e3d9a6 (commit) via 6103d73dce4fac75f7113244efc7f6a1f24777ae (commit) via 39f4a60035085e7b1465fa7159d3ef03114dfe27 (commit) via 2838a74097cd0e6df76a4f2e6bf86cacbcad4a39 (commit) via bfd4b415be8b5cb2ace7676bc266f0d690a38575 (commit) via a1b6585b74e0ca64b4aefd0e5fe4d357a559fc88 (commit) via 85eda6ff84a027543e4d1712a261a26a63188667 (commit) via eb80096cbe8b11105f7be0eb99233667e8836c1a (commit) via de97cc3892f9655e292af8d7d235f2c1eb77b3b7 (commit) via f86359ec440f3462df0e7cf10cc9e95d959167d8 (commit) via 713e086aff3a83eb357c69a4909cac379d4b37dc (commit) via 013d39a06cddaa177ed7d0ec8df5d0dfb69e0a9d (commit) via dc9780ac6850ddf839f1ac6cb7cfcf4d70e38a15 (commit) via c1a253b002c83f276ad9407b2257c3e7c1b5e3f7 (commit) via 5bcb05cc16846edfc54cd20cff0ff4aa187d0aec (commit) via 972d098319ededd2ea94c5103b2d347faa0e2118 (commit) via 902c725b2cfce8126c8f397e8a7a794ab1cd932e (commit) via 8c03e1112beef9e251b46c14fe7b1baa1225a12f (commit) via 74f0280dca9f8e9b4b3b2f627f440ba5c59f7406 (commit) via 4ee4b85123b50a6c57d6bc6c63dc0617e78a75e0 (commit) via 78dfb98f7d670b7a25bd00db4965151eabced39c (commit) via bd715593734bc7fc92b478e3b3d9a9104e9451ff (commit) via 4c41f132f411aae967a990d94a0dd47f91aa355c (commit) via 50a56ba2ee9984d124a93afdb4f3a5d13bb5617d (commit) via 12a3bca16f317e52d79ac0eaa3217dd5986638db (commit) via 736acc71a70a7c04f0d2afa0c277fb012fb0a5b6 (commit) via da19447883a39d0469f75e4cd1d064c184d5e992 (commit) via 8c3bc258e34993d3dcc52ff1c1b2fa725f63891f (commit) via fcf31af212cf98bf886ca359ab3334b29c358474 (commit) via e3d695473d95fe8e23df6a5dadb1a802854471da (commit) via 5339f20be22d4290876fcfd6b2afb2c35f1f0593 (commit) via 75d6f80fd210bbcb6a7979f58f06e9323097ba2e (commit) via da9ef71013d7b975795a8778f806f1d470c83373 (commit) via 916ede06b72a422bbda8b9be254e430139af13de (commit) via 2bb6fa7c44588c25428aec81a423fec8a3e02fb9 (commit) via 99bd8a74073603482d7bf64acd54617a908ae36f (commit) via 3f59e8d1fb8d7b9b6c878ddbb17ee21b64af196f (commit) via 4d6a7843f1e95a6680a629c11f6187a5d36b1385 (commit) via 777f7e87bc1b80d0754be6cdae7d343045ba69b0 (commit) via c6ea1492addb855ef77416492235d50097c3fb45 (commit) via 40ef0b1ee1f38cbb7438ac84683a2094e14f2b09 (commit) via 88a2c540579d6bfd6579346265eadc2797b43dd5 (commit) via e3e479d077044175dca0376739eeafde49610573 (commit) via 4ebd7e4a0888f404fa5f85ff8651d33390916c04 (commit) via 9e3bb8346c9811d4f9036dd123dd2dad2b58c5ec (commit) from 1a9521eae3fa2d3348a39567b26431d81eb10c65 (commit) - Log ----------------------------------------------------------------- commit f63a934407e11ddd48d146d30921dee225a0da05 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Mon Dec 1 02:13:20 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Mon Dec 1 02:13:20 2025 +0100 update for 4.4.7 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/Changelog b/Changelog index dbe2432a79..b58968dbfa 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,86 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. +version 4.4.7: + avutil/common: cast GET_BYTE/GET_16BIT returned value + avcodec/utvideodec: Set B for the width= 1 case in restore_median_planar_il() + avformat/rtpdec_rfc4175: Only change PayloadContext on success + avformat/rtpdec_rfc4175: Check dimensions + avformat/rtpdec_rfc4175: Fix memleak of sampling + avformat/http: Fix off by 1 error + avcodec/exr: spelling + avcodec/exr: use tile dimensions in pxr24 UINT case + avcodec/exr: Simple check for available channels + avformat/sctp: Check size in sctp_write() + avformat/rtmpproto: consider command line argument lengths + avformat/rtmpproto_ Check tcurl and flashver length + avcodec/g723_1enc: Make min_err 64bit + avformat/rtpenc_h264_hevc: Check space for nal_length_size in ff_rtp_send_h264_hevc() + swscale/output: Fix integer overflow in yuv2ya16_X_c_template() + avcodec/exr: Check that DWA has 3 channels + avcodec/exr: check ac_size + avcodec/exr: Round dc_w/h up + avcodec/mjpegdec: Explain buf_size/width/height check + fftools/ffmpeg_mux_init: Fix double-free on error + avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX + avformat/aviobuf: Keep checksum_ptr consistent in avio_seek() + aacenc_tns: clamp filter direction energy measurement + avcodec/dxv: Check coded_height, to avoid invalid av_clip() + avcodec/aac/aacdec: dont allow ff_aac_output_configure() allocating a new frame if it has no frame + avformat/lrcdec: Fix fate-sub-lrc-ms-remux on x86-32 + avcodec/sanm: Check w,h,left,top + avcodec/utvideodec: Clear plane_start array + avcodec/dxv: Check that we initialize op_data + avcodec/exr: Check for pixel type consistency in DWA + avcodec/g726: init missing sample rate + avformat/lrcdec: limit input timestamp range to avoid overflows + avcodec/scpr3: Clear clr + avcodec/ilbcdec: Clear cbvec when used with create_augmented_vector() + avcodec/jpeg2000dec: Make sure the 4 extra bytes allocated are initialized + avfilter/avf_showcqt: fix unbounded index when copying to fft_data + avcodec/aacsbr_template: Check ilb + avcodec/utvideodec: Set B for the width= 1 case + avcodec/ffv1: Clear state on alloc + avcodec/jpeg2000dec: implement cdef remapping during pixel format matching + avcodec/jpeg2000dec: move cdef default check into get_siz() + avcodec/exr: Check rle_raw_data and surroundings + avcodec/exr: Dont access outside xsize/ysize + examples: Add check and replace av_free() to avoid potential memory errors + libavcodec/tests/snowenc: Add av_free() to avoid memory leak + avcodec/mpc8: init avctx->sample_rate + avformat/hls: add cmfv/cmfa exceptions + avformat/lrcdec: support arbitrary precision timestamp + avcodec/ffv1dec: Disable frame threading due to race condition + libavcodec/tests/motion: Add check for avcodec_alloc_context3() + avcodec/tests/avpacket: Add av_free() to avoid memory leak + examples: Add av_freep to avoid potential memory leak + avcodec/tests/avpacket: Add av_packet_free() to avoid memory leak + avcodec/fits: Clear naxis + avcodec/vqavideo; Check bytestream2_get_buffer() reading next_codebook_buffer + avcodec/lzf: Check for input space + avcodec/imc: Clear padding of buf16 + avcodec/cri: Check bytestream2_get_buffer() for end + avcodec/cri: Factor read_len out + avformat/dashdec: Allocate space for appended "/" + avformat/mxg: clear AV_INPUT_BUFFER_PADDING_SIZE + avformat/mov: make sure file_checksum is fully initialized + avformat/asfdec_f: Check amount of value read + avformat/concatdec: Clip duration in one more case in get_best_effort_duration() + avcodec/ffv1dec: Check k in get_vlc_symbol() + avcodec/cfhd: Check idwt_buf size before allocation + avcodec/ivi: Check luma/chroma mb_size + avcodec/motion_est: don't add offsets to NULL pointers + swscale/swscale_unscaled: don't add offsets to NULL pointers + avcodec/psd: Move frame allocation after RLE processing + avcodec/smacker: Move buffer allocation to later + avcodec/opus: don't materialize buf pointer from null + avformat/iff: Check nb_channels == 0 in CHNL + avcodec/mss2dsp: use FF_PTR_ADD to add offsets to a pointer + avformat/hls: check return value of new_init_section() + avcodec/rkmppdec: Fix double-free on error + avcodec/ppc/vp8dsp_altivec: Fix out-of-bounds access + avcodec/x86/pngdsp: add missing emms at the end of add_png_paeth_prediction + version 4.4.6: avcodec/takdec: Check remaining space for first predictors avcodec/svq3: Check there are bits left before decompression diff --git a/RELEASE b/RELEASE index b98ff4c483..c966188e11 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -4.4.6 +4.4.7 diff --git a/doc/Doxyfile b/doc/Doxyfile index 5193355163..94fa4e82d2 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = FFmpeg # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 4.4.6 +PROJECT_NUMBER = 4.4.7 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a commit 468e425a23d8ea149f15503ec3a9adbd890b3357 Author: Zhao Zhili <quinkblack(a)foxmail.com> AuthorDate: Fri Nov 14 17:23:22 2025 +0800 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:26 2025 +0100 avutil/common: cast GET_BYTE/GET_16BIT returned value In case of GET_BYTE/GET_16BIT return signed value. (cherry picked from commit 0ae8df5f2ceea82337a2456ef16f930faf160189) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavutil/common.h b/libavutil/common.h index aee353d399..16e52e33b0 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -497,13 +497,13 @@ static av_always_inline av_const int av_parity_c(uint32_t v) * to prevent undefined results. */ #define GET_UTF8(val, GET_BYTE, ERROR)\ - val= (GET_BYTE);\ + val= (uint8_t)(GET_BYTE);\ {\ uint32_t top = (val & 128) >> 1;\ if ((val & 0xc0) == 0x80 || val >= 0xFE)\ {ERROR}\ while (val & top) {\ - unsigned int tmp = (GET_BYTE) - 128;\ + unsigned int tmp = (uint8_t)(GET_BYTE) - 128;\ if(tmp>>6)\ {ERROR}\ val= (val<<6) + tmp;\ @@ -522,11 +522,11 @@ static av_always_inline av_const int av_parity_c(uint32_t v) * typically a goto statement. */ #define GET_UTF16(val, GET_16BIT, ERROR)\ - val = (GET_16BIT);\ + val = (uint16_t)(GET_16BIT);\ {\ unsigned int hi = val - 0xD800;\ if (hi < 0x800) {\ - val = (GET_16BIT) - 0xDC00;\ + val = (uint16_t)(GET_16BIT) - 0xDC00;\ if (val > 0x3FFU || hi > 0x3FFU)\ {ERROR}\ val += (hi<<10) + 0x10000;\ commit 56ff5db7d759b3b33344709b214e68e55a775e10 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sat Nov 8 23:22:56 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:26 2025 +0100 avcodec/utvideodec: Set B for the width= 1 case in restore_median_planar_il() Fixes: use of uninitialized memory Fixes: 439878388/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_UTVIDEO_DEC_fuzzer-5635866203848704 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 59db32b433ea9e7766ec7fac994860ed15d7ed7d) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 65ae623d3f..0c7af440a8 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -436,7 +436,7 @@ static void restore_median_planar_il(UtvideoContext *c, uint8_t *src, ptrdiff_t // second line - first element has top prediction, the rest uses median C = bsrc[-stride2]; bsrc[0] += C; - A = bsrc[0]; + A = B = bsrc[0]; for (i = 1; i < FFMIN(width, 16); i++) { /* scalar loop (DSP need align 16) */ B = bsrc[i - stride2]; bsrc[i] += mid_pred(A, B, (uint8_t)(A + B - C)); commit ace015bd43b8e2d73c28e2da2c99f4519296b3ec Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Oct 31 16:27:56 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:26 2025 +0100 avformat/rtpdec_rfc4175: Only change PayloadContext on success Reviewed-by: Joshua Rogers <joshua(a)joshua.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit c03e49dd1d8ee2dd21c24002dfac95644c830498) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index 978ec5c8c2..4683d93a64 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -23,6 +23,7 @@ #include "avio_internal.h" #include "rtpdec_formats.h" +#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" @@ -91,33 +92,39 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, } static int rfc4175_parse_sdp_line(AVFormatContext *s, int st_index, - PayloadContext *data, const char *line) + PayloadContext *data_arg, const char *line) { const char *p; if (st_index < 0) return 0; + av_assert0(!data_arg->sampling); + if (av_strstart(line, "fmtp:", &p)) { AVStream *stream = s->streams[st_index]; + PayloadContext data0 = *data_arg, *data = &data0; int ret = ff_parse_fmtp(s, stream, data, p, rfc4175_parse_fmtp); + if (!data->sampling || !data->depth || !data->width || !data->height) + ret = AVERROR(EINVAL); + if (ret < 0) - return ret; + goto fail; ret = av_image_check_size(data->width, data->height, 0, s); if (ret < 0) - return ret; - - if (!data->sampling || !data->depth || !data->width || !data->height) - return -1; + goto fail; stream->codecpar->width = data->width; stream->codecpar->height = data->height; ret = rfc4175_parse_format(stream, data); av_freep(&data->sampling); - + if (ret >= 0) + *data_arg = *data; +fail: + av_freep(&data->sampling); return ret; } commit d81116742b1f5962979d710bb26011e3f8eedae7 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Oct 31 16:28:49 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:26 2025 +0100 avformat/rtpdec_rfc4175: Check dimensions Fixes: out of array access Fixes: zeropath/int_overflow_in_rtpdec_rfc4175 Found-by: Joshua Rogers <joshua(a)joshua.hu> Reviewed-by: Joshua Rogers <joshua(a)joshua.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit d4e0d5ed48aa9c0e11b9ddeea8c2d14632314089) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index 47580d0b24..978ec5c8c2 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -24,6 +24,7 @@ #include "avio_internal.h" #include "rtpdec_formats.h" #include "libavutil/avstring.h" +#include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" struct PayloadContext { @@ -104,6 +105,9 @@ static int rfc4175_parse_sdp_line(AVFormatContext *s, int st_index, if (ret < 0) return ret; + ret = av_image_check_size(data->width, data->height, 0, s); + if (ret < 0) + return ret; if (!data->sampling || !data->depth || !data->width || !data->height) return -1; @@ -205,6 +209,9 @@ static int rfc4175_handle_packet(AVFormatContext *ctx, PayloadContext *data, if (length > payload_len) length = payload_len; + if (line >= data->height) + return AVERROR_INVALIDDATA; + /* prevent ill-formed packets to write after buffer's end */ copy_offset = (line * data->width + offset) * data->pgroup / data->xinc; if (copy_offset + length > data->frame_size) commit 2eecc2c6e776fb7d1b7f4c8b2c4ead46b6a41065 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Oct 31 16:17:27 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:26 2025 +0100 avformat/rtpdec_rfc4175: Fix memleak of sampling Reviewed-by: Joshua Rogers <joshua(a)joshua.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit af3dee313223c722c34e8231cd6859188928a6e3) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index e9c62c1389..47580d0b24 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -81,7 +81,7 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, data->width = atoi(value); else if (!strncmp(attr, "height", 6)) data->height = atoi(value); - else if (!strncmp(attr, "sampling", 8)) + else if (data->sampling == NULL && !strncmp(attr, "sampling", 8)) data->sampling = av_strdup(value); else if (!strncmp(attr, "depth", 5)) data->depth = atoi(value); commit 96fcd37fd03441dbe0187afe1d4f7dd55e146249 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Oct 31 17:32:56 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:26 2025 +0100 avformat/http: Fix off by 1 error Fixes: out of array access Fixes: zeropath/off-by-one-one-byte Found-by: Joshua Rogers <joshua(a)joshua.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit b518c027a0cb8d89c586fe241cc99b1c20bc0f50) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/http.c b/libavformat/http.c index fb2d9306bd..b8921f25d2 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1665,7 +1665,7 @@ static int store_icy(URLContext *h, int size) ret = http_read_stream_all(h, data, len); if (ret < 0) return ret; - data[len + 1] = 0; + data[len] = 0; if ((ret = av_opt_set(s, "icy_metadata_packet", data, 0)) < 0) return ret; update_metadata(h, data); commit 0fcf3321f7df99fd806d0a50acfc665a2fabe0c8 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sat Nov 8 01:17:46 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:25 2025 +0100 avcodec/exr: spelling Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit d80f8f36513ebff05c537adbe756e36036f80074) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 12b1a927e9..cf5af2f36a 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -173,7 +173,7 @@ typedef struct EXRContext { int is_luma;/* 1 if there is an Y plane */ #define M(chr) (1<<chr - 'A') - int has_channel; ///< combinatin of flags representing the channel codes A-Z + int has_channel; ///< combination of flags representing the channel codes A-Z GetByteContext gb; const uint8_t *buf; commit 96a27bebf5f035d4b3565e03eb1c0fdad1e9b5a4 Author: veygax <veyga(a)veygax.dev> AuthorDate: Sun Nov 2 02:35:40 2025 +0000 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:25 2025 +0100 avcodec/exr: use tile dimensions in pxr24 UINT case update the switch statement for EXR_UINT in pxr24_uncompress to correctly use the tile width td->xsize instead of using the full window width s->xdelta. s->delta is larger than td->xsize which lead to two buffer overflows when interacting with the ptr variable in the same switch statement. Fixes: out of bounds read and write Found-by: veygax's insomnia network (INSOMNIA-1) Signed-off-by: veygax <veyga(a)veygax.dev> (cherry picked from commit 162f75b5e6798b385bb3eadd8280eff52d03cf29) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/exr.c b/libavcodec/exr.c index dd73ece558..12b1a927e9 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -741,12 +741,12 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t *src, break; case EXR_UINT: ptr[0] = in; - ptr[1] = ptr[0] + s->xdelta; - ptr[2] = ptr[1] + s->xdelta; - ptr[3] = ptr[2] + s->xdelta; - in = ptr[3] + s->xdelta; + ptr[1] = ptr[0] + td->xsize; + ptr[2] = ptr[1] + td->xsize; + ptr[3] = ptr[2] + td->xsize; + in = ptr[3] + td->xsize; - for (j = 0; j < s->xdelta; ++j) { + for (j = 0; j < td->xsize; ++j) { uint32_t diff = ((uint32_t)*(ptr[0]++) << 24) | (*(ptr[1]++) << 16) | (*(ptr[2]++) << 8 ) | commit b2f5dd780d97a04bc52948aa42fe18c529c5e3b1 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Sep 19 00:20:36 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:25 2025 +0100 avcodec/exr: Simple check for available channels The existing is_luma check is fragile as depending on the order of channels it can be set or reset No testcase Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 6e8cf0377fee75de9ad2cc87385ab3e8f2c87143) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/exr.c b/libavcodec/exr.c index fc1d150e4d..dd73ece558 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -172,6 +172,9 @@ typedef struct EXRContext { int is_luma;/* 1 if there is an Y plane */ +#define M(chr) (1<<chr - 'A') + int has_channel; ///< combinatin of flags representing the channel codes A-Z + GetByteContext gb; const uint8_t *buf; int buf_size; @@ -1604,6 +1607,7 @@ static int decode_header(EXRContext *s, AVFrame *frame) s->is_tile = 0; s->is_multipart = 0; s->is_luma = 0; + s->has_channel = 0; s->current_part = 0; if (bytestream2_get_bytes_left(gb) < 10) { @@ -1707,23 +1711,26 @@ static int decode_header(EXRContext *s, AVFrame *frame) } if (layer_match) { /* only search channel if the layer match is valid */ + if (strlen(ch_gb.buffer) == 1) { + int ch_chr = av_toupper(*ch_gb.buffer); + if (ch_chr >= 'A' && ch_chr <= 'Z') + s->has_channel |= M(ch_chr); + av_log(s->avctx, AV_LOG_DEBUG, "%c\n", ch_chr); + } + if (!av_strcasecmp(ch_gb.buffer, "R") || !av_strcasecmp(ch_gb.buffer, "X") || !av_strcasecmp(ch_gb.buffer, "U")) { channel_index = 0; - s->is_luma = 0; } else if (!av_strcasecmp(ch_gb.buffer, "G") || !av_strcasecmp(ch_gb.buffer, "V")) { channel_index = 1; - s->is_luma = 0; } else if (!av_strcasecmp(ch_gb.buffer, "Y")) { channel_index = 1; - s->is_luma = 1; } else if (!av_strcasecmp(ch_gb.buffer, "B") || !av_strcasecmp(ch_gb.buffer, "Z") || !av_strcasecmp(ch_gb.buffer, "W")) { channel_index = 2; - s->is_luma = 0; } else if (!av_strcasecmp(ch_gb.buffer, "A")) { channel_index = 3; } else { @@ -1799,6 +1806,20 @@ static int decode_header(EXRContext *s, AVFrame *frame) s->current_channel_offset += 4; } } + if (!((M('R') + M('G') + M('B')) & ~s->has_channel)) { + s->is_luma = 0; + } else if (!((M('X') + M('Y') + M('Z')) & ~s->has_channel)) { + s->is_luma = 0; + } else if (!((M('Y') + M('U') + M('V')) & ~s->has_channel)) { + s->is_luma = 0; + } else if (!((M('Y') ) & ~s->has_channel) && + !((M('R') + M('G') + M('B') + M('U') + M('V') + M('X') + M('Z')) & s->has_channel)) { + s->is_luma = 1; + } else { + avpriv_request_sample(s->avctx, "Uncommon channel combination"); + ret = AVERROR(AVERROR_PATCHWELCOME); + goto fail; + } /* Check if all channels are set with an offset or if the channels * are causing an overflow */ commit 3a850b1e0f51bcd8ef141be1764652af2661b526 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Oct 31 23:08:45 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:25 2025 +0100 avformat/sctp: Check size in sctp_write() Fixes: out of array access No testcase Found-by: Joshua Rogers <joshua(a)joshua.hu> with ZeroPath Reviewed-by: Joshua Rogers <joshua(a)joshua.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 5b98cea4bff2cbbb251b621a2b6c3ab76f814efa) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/sctp.c b/libavformat/sctp.c index be0cb47865..aa500d5ea3 100644 --- a/libavformat/sctp.c +++ b/libavformat/sctp.c @@ -334,6 +334,9 @@ static int sctp_write(URLContext *h, const uint8_t *buf, int size) } if (s->max_streams) { + if (size < 2) + return AVERROR(EINVAL); + /*StreamId is introduced as a 2byte code into the stream*/ struct sctp_sndrcvinfo info = { 0 }; info.sinfo_stream = AV_RB16(buf); commit a40b8f4ee38373f9ee2b182c8d561832ed49f264 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Thu Oct 30 23:20:41 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:25 2025 +0100 avformat/rtmpproto: consider command line argument lengths Fixes: out of array access Fixes: zeropath/rtmp-2025-10 Found-by: Joshua Rogers <joshua(a)joshua.hu> Reviewed-by: Joshua Rogers <joshua(a)joshua.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 83e0298de217a7108ee703806d6380e554007972) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 5e6531f93f..7db1d26142 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -157,6 +157,13 @@ static int handle_chunk_size(URLContext *s, RTMPPacket *pkt); static int handle_window_ack_size(URLContext *s, RTMPPacket *pkt); static int handle_set_peer_bw(URLContext *s, RTMPPacket *pkt); +static size_t zstrlen(const char *c) +{ + if(c) + return strlen(c); + return 0; +} + static int add_tracked_method(RTMPContext *rt, const char *name, int id) { int err; @@ -321,7 +328,15 @@ static int gen_connect(URLContext *s, RTMPContext *rt) int ret; if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, - 0, 4096 + APP_MAX_LENGTH)) < 0) + 0, 4096 + APP_MAX_LENGTH + + strlen(rt->auth_params) + strlen(rt->flashver) + + zstrlen(rt->swfurl) + + zstrlen(rt->swfverify) + + zstrlen(rt->tcurl) + + zstrlen(rt->auth_params) + + zstrlen(rt->pageurl) + + zstrlen(rt->conn)*3 + )) < 0) return ret; p = pkt.data; @@ -1865,7 +1880,8 @@ static int write_status(URLContext *s, RTMPPacket *pkt, if ((ret = ff_rtmp_packet_create(&spkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, 0, - RTMP_PKTDATA_DEFAULT_SIZE)) < 0) { + RTMP_PKTDATA_DEFAULT_SIZE + + strlen(status))) < 0) { av_log(s, AV_LOG_ERROR, "Unable to create response packet\n"); return ret; } commit 8ff2d9606555c0c62f698d54be27080dcf90ceb7 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Thu Oct 30 23:05:57 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:24 2025 +0100 avformat/rtmpproto_ Check tcurl and flashver length Fixes: out of array accesses Reviewed-by: Joshua Rogers <joshua(a)joshua.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit a64e037429f20873ec48f6c82aa145ab448e1399) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 5b5cff63f8..5e6531f93f 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2796,6 +2796,12 @@ reconnect: "FMLE/3.0 (compatible; %s)", LIBAVFORMAT_IDENT); } } + if ( strlen(rt->flashver) > FLASHVER_MAX_LENGTH + || strlen(rt->tcurl ) > TCURL_MAX_LENGTH + ) { + ret = AVERROR(EINVAL); + goto fail; + } rt->receive_report_size = 1048576; rt->bytes_read = 0; commit 25d9db13cae96d57b7888560a4d750de95cc26ef Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Tue Oct 7 01:58:34 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:24 2025 +0100 avcodec/g723_1enc: Make min_err 64bit This is intending to fix the case described in https://lists.ffmpeg.org/archives/list/ffmpeg-devel@ffmpeg.org/thread/AAZ7G… Where FCBParam optim is used uninitialized a min_err of 1<<30, allows the struct to be never initilialized as all err (which is int32_t) can be larger than min_err. By increasing min_err above the int32_t range this is no longer possible Untested, as i do not have the testcase Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc>i (cherry picked from commit 909af3a571da830cc70a34f0c3946379bd12dfbe) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/g723_1.h b/libavcodec/g723_1.h index 521f220b2a..f3cd32e37d 100644 --- a/libavcodec/g723_1.h +++ b/libavcodec/g723_1.h @@ -108,7 +108,7 @@ typedef struct HFParam { * Optimized fixed codebook excitation parameters */ typedef struct FCBParam { - int min_err; + int64_t min_err; int amp_index; int grid_index; int dirac_train; diff --git a/libavcodec/g723_1enc.c b/libavcodec/g723_1enc.c index 11b0c7f71e..c9d6871b32 100644 --- a/libavcodec/g723_1enc.c +++ b/libavcodec/g723_1enc.c @@ -1019,7 +1019,7 @@ static void fcb_search(G723_1_ChannelContext *p, int16_t *impulse_resp, int pulse_cnt = pulses[index]; int i; - optim.min_err = 1 << 30; + optim.min_err = 1LL << 31; get_fcb_param(&optim, impulse_resp, buf, pulse_cnt, SUBFRAME_LEN); if (p->pitch_lag[index >> 1] < SUBFRAME_LEN - 2) { commit 8d174ecd1047dbd5504b0ce5f9aa1a85fc491ff8 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Oct 24 20:29:23 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:24 2025 +0100 avformat/rtpenc_h264_hevc: Check space for nal_length_size in ff_rtp_send_h264_hevc() Fixes: memcpy with negative size Fixes: momo_trip-poc/input Reported-by: Momoko Shiraishi <shiraishi(a)os.is.s.u-tokyo.ac.jp> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit d03483bd265b68db00c9b90f6f48dcf61c5c300d) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/rtpenc_h264_hevc.c b/libavformat/rtpenc_h264_hevc.c index 0c88fc2a23..470430478b 100644 --- a/libavformat/rtpenc_h264_hevc.c +++ b/libavformat/rtpenc_h264_hevc.c @@ -195,6 +195,9 @@ void ff_rtp_send_h264_hevc(AVFormatContext *s1, const uint8_t *buf1, int size) r1 = ff_avc_mp4_find_startcode(r, end, s->nal_length_size); if (!r1) r1 = end; + // Check that the last is not truncated + if (r1 - r < s->nal_length_size) + break; r += s->nal_length_size; } else { while (!*(r++)); commit 1c4bbca9326817e549d449726ec7a9348d348589 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Mon Oct 13 14:32:45 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:24 2025 +0100 swscale/output: Fix integer overflow in yuv2ya16_X_c_template() Found-by: colod colod <colodcolod7(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 0c6b7f9483a38657c9be824572b4c0c45d4d9fef) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libswscale/output.c b/libswscale/output.c index be22279229..49af3818b9 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -911,7 +911,7 @@ yuv2ya16_X_c_template(SwsContext *c, const int16_t *lumFilter, int A = 0xffff; for (j = 0; j < lumFilterSize; j++) - Y += lumSrc[j][i] * lumFilter[j]; + Y += lumSrc[j][i] * (unsigned)lumFilter[j]; Y >>= 15; Y += (1<<3) + 0x8000; @@ -920,7 +920,7 @@ yuv2ya16_X_c_template(SwsContext *c, const int16_t *lumFilter, if (hasAlpha) { A = -0x40000000 + (1<<14); for (j = 0; j < lumFilterSize; j++) - A += alpSrc[j][i] * lumFilter[j]; + A += alpSrc[j][i] * (unsigned)lumFilter[j]; A >>= 15; A += 0x8000; commit 26e3ed6080daffd2cbb14167cb060e94dc15998a Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Sep 19 00:18:30 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:24 2025 +0100 avcodec/exr: Check that DWA has 3 channels The implementation hardcodes access to 3 channels, so we need to check that Fixes: out of array access Fixes: BIGSLEEP-445394503-crash.exr Found-by: Google Big Sleep Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 7896cc67c13037abba8941e39a74c56d26b775a7) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 85c925fb66..fc1d150e4d 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1007,6 +1007,11 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size if (version != 2) return AVERROR_INVALIDDATA; + if (s->nb_channels < 3) { + avpriv_request_sample(s->avctx, "Gray DWA"); + return AVERROR_PATCHWELCOME; + } + lo_usize = AV_RL64(src + 8); lo_size = AV_RL64(src + 16); ac_size = AV_RL64(src + 24); commit 447d98b07235c04437e7d3836fc97195a503fe3d Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Thu Sep 18 17:32:46 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:24 2025 +0100 avcodec/exr: check ac_size Fixes: out of array read Fixes: dwa_uncompress.py.crash.exr The code will read from the ac data even if ac_size is 0, thus that case is not implemented and we ask for a sample and error out cleanly Found-by: Google Big Sleep Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 8e078826da6f2a1dffa25162121b43b272f5e5fa) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/exr.c b/libavcodec/exr.c index d277eb7858..85c925fb66 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1023,6 +1023,11 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size ) return AVERROR_INVALIDDATA; + if (ac_size <= 0) { + avpriv_request_sample(s->avctx, "Zero ac_size"); + return AVERROR_INVALIDDATA; + } + if ((uint64_t)rle_raw_size > INT_MAX) { avpriv_request_sample(s->avctx, "Too big rle_raw_size"); return AVERROR_INVALIDDATA; commit c20c66499812b85ab3876e746a5474376b6000b1 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Thu Sep 18 21:28:04 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:23 2025 +0100 avcodec/exr: Round dc_w/h up Without rounding them up there are too few dc coeffs for the blocks. We do not know if this way of handling odd dimensions is correct, as we have no such DWA sample. thus we ask the user for a sample if she encounters such a file Fixes: out of array access Fixes: BIGSLEEP-445392027-crash.exr Found-by: Google Big Sleep Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit c911e0001115bbda904ad103b12c27b9a3c0c265) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/exr.c b/libavcodec/exr.c index bbf1cd9984..d277eb7858 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -994,8 +994,8 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size int64_t version, lo_usize, lo_size; int64_t ac_size, dc_size, rle_usize, rle_csize, rle_raw_size; int64_t ac_count, dc_count, ac_compression; - const int dc_w = td->xsize >> 3; - const int dc_h = td->ysize >> 3; + const int dc_w = (td->xsize + 7) >> 3; + const int dc_h = (td->ysize + 7) >> 3; GetByteContext gb, agb; int skip, ret; int have_rle = 0; @@ -1028,6 +1028,10 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size return AVERROR_INVALIDDATA; } + if (td->xsize % 8 || td->ysize % 8) { + avpriv_request_sample(s->avctx, "odd dimensions DWA"); + } + bytestream2_init(&gb, src + 88, compressed_size - 88); skip = bytestream2_get_le16(&gb); if (skip < 2) commit a1a5ab07ee6f04c563e56c576136a500c4ab8a7c Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Thu Sep 11 20:12:55 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:23 2025 +0100 avcodec/mjpegdec: Explain buf_size/width/height check Suggested-by: Ramiro Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 61b6877637041a1f817ad9811c839b0feae2b8af) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 03597ba3e2..be7c64894c 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -338,6 +338,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height); if (av_image_check_size(width, height, 0, s->avctx) < 0) return AVERROR_INVALIDDATA; + + // A valid frame requires at least 1 bit for DC + 1 bit for AC for each 8x8 block. if (s->buf_size && (width + 7) / 8 * ((height + 7) / 8) > s->buf_size * 4LL) return AVERROR_INVALIDDATA; commit 0cf474451d51d984ae574754a0ce993faac97526 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Mon Mar 25 16:54:25 2024 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:23 2025 +0100 fftools/ffmpeg_mux_init: Fix double-free on error MATCH_PER_STREAM_OPT iterates over all options of a given OptionDef and tests whether they apply to the current stream; if so, they are set to ost->apad, otherwise, the code errors out. If no error happens, ost->apad is av_strdup'ed in order to take ownership of this pointer. But this means that setting it originally was premature, as it leads to double-frees when an error happens lateron. This can simply be reproduced with ffmpeg -filter_complex anullsrc -apad bar -apad:n baz -f null - This is a regression since 83ace80bfd80fcdba2c65fa1d554923ea931d5bd. Fix this by using a temporary variable instead of directly setting ost->apad. Also only strdup the string if it actually is != NULL. Reviewed-by: Marth64 <marth64(a)proxyid.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> (cherry picked from commit ced5c5fdb8634d39ca9472a2026b2d2fea16c4e5) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 8a1ccbd5dd76fb12ad75528038a9f7f50fee330d) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 807e783422..feaf4faebb 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1916,6 +1916,7 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in if (!ost->stream_copy) { char *sample_fmt = NULL; + const char *apad = NULL; MATCH_PER_STREAM_OPT(audio_channels, i, audio_enc->channels, oc, st); @@ -1928,8 +1929,12 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st); - MATCH_PER_STREAM_OPT(apad, str, ost->apad, oc, st); - ost->apad = av_strdup(ost->apad); + MATCH_PER_STREAM_OPT(apad, str, apad, oc, st); + if (apad) { + ost->apad = av_strdup(apad); + if (!ost->apad) + exit_program(1); + } ost->avfilter = get_ost_filters(o, oc, ost); if (!ost->avfilter) commit 3798f1b2311946183551ba30e945abda4bf52100 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Tue Mar 12 23:23:17 2024 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:23 2025 +0100 avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX Affects many FATE-tests, see https://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-1… Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> (cherry picked from commit 7a089ed8e049e3bfcb22de1250b86f2106060857) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 7da14d07f6..3b72f93265 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1694,7 +1694,7 @@ static int check_stream_max_drift(AVFormatContext *s) int *idx = av_mallocz_array(s->nb_streams, sizeof(*idx)); if (!idx) return AVERROR(ENOMEM); - for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1LU) { + for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1ULL) { int64_t max_dts = INT64_MIN / 2; int64_t min_dts = INT64_MAX / 2; int64_t max_buffer = 0; commit c3069227bc1c0ad4acfb9c1c802c1d2f0b077c8a Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Fri Jul 11 22:58:26 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:23 2025 +0100 avformat/aviobuf: Keep checksum_ptr consistent in avio_seek() Otherwise it might be > buf_ptr in which case ffio_get_checksum() could segfault (s->buf_ptr - s->checksum_ptr would be negative which would be converted to something very big when converted to unsigned for the update_checksum callback). Fixes ticket #11233. Reported-by: Du4t Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> (cherry picked from commit 987c955cd7e972d9940284fa6ae7187ac858ebb1) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 1fb30644ff..3b963a6152 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -327,7 +327,7 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence) s->seek_count ++; if (!s->write_flag) s->buf_end = s->buffer; - s->buf_ptr = s->buf_ptr_max = s->buffer; + s->checksum_ptr = s->buf_ptr = s->buf_ptr_max = s->buffer; s->pos = offset; } s->eof_reached = 0; commit 21fe514152a22cc5653fd95f065320adfcf076e9 Author: Lynne <dev(a)lynne.ee> AuthorDate: Sat Feb 8 04:35:31 2025 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:23 2025 +0100 aacenc_tns: clamp filter direction energy measurement The issue is that: float en[2]; ... tns->n_filt[w] = is8 ? 1 : order != TNS_MAX_ORDER ? 2 : 3; for (g = 0; g < tns->n_filt[w]; g++) { tns->direction[w][g] = slant != 2 ? slant : en[g] < en[!g]; When using the AAC Main profile, n_filt = 3, and slant is by default 2 (normal long frames), g can go above 1. en is the evolution of energy in the frequency domain for every band at the given window. E.g. whether the energy is concentrated at the top of each band, or the bottom. For 2-pole filters, its straightforward. For 3-pole filters, we need more than 2 measurements. This commit properly implements support for 3-pole filters, by measuring the band energy across three areas. Do note that even xHE-AAC caps n_filt to 2, and only AAC Main allows n_filt == 3. Fixes https://trac.ffmpeg.org/ticket/11418 (cherry picked from commit ed09aa28ae3b4509f00a24a9ebdeb084ee00736a) (cherry picked from commit f98f142da571653436596ccad2d09c7e39bfd4fb) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c index 2ffe1f8de8..f56226c0c7 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aacenc_tns.c @@ -173,6 +173,7 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) sce->ics.window_sequence[0] == LONG_START_SEQUENCE ? 0 : 2; const int sfb_len = sfb_end - sfb_start; const int coef_len = sce->ics.swb_offset[sfb_end] - sce->ics.swb_offset[sfb_start]; + const int n_filt = is8 ? 1 : order != TNS_MAX_ORDER ? 2 : 3; if (coef_len <= 0 || sfb_len <= 0) { sce->tns.present = 0; @@ -180,16 +181,30 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) } for (w = 0; w < sce->ics.num_windows; w++) { - float en[2] = {0.0f, 0.0f}; - int oc_start = 0, os_start = 0; + float en[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + int oc_start = 0; int coef_start = sce->ics.swb_offset[sfb_start]; - for (g = sfb_start; g < sce->ics.num_swb && g <= sfb_end; g++) { - FFPsyBand *band = &s->psy.ch[s->cur_channel].psy_bands[w*16+g]; - if (g > sfb_start + (sfb_len/2)) - en[1] += band->energy; - else - en[0] += band->energy; + if (n_filt == 2) { + for (g = sfb_start; g < sce->ics.num_swb && g <= sfb_end; g++) { + FFPsyBand *band = &s->psy.ch[s->cur_channel].psy_bands[w*16+g]; + if (g > sfb_start + (sfb_len/2)) + en[1] += band->energy; /* End */ + else + en[0] += band->energy; /* Start */ + } + en[2] = en[0]; + } else { + for (g = sfb_start; g < sce->ics.num_swb && g <= sfb_end; g++) { + FFPsyBand *band = &s->psy.ch[s->cur_channel].psy_bands[w*16+g]; + if (g > sfb_start + (sfb_len/2) + (sfb_len/4)) + en[2] += band->energy; /* End */ + else if (g > sfb_start + (sfb_len/2) - (sfb_len/4)) + en[1] += band->energy; /* Middle */ + else + en[0] += band->energy; /* Start */ + } + en[3] = en[0]; } /* LPC */ @@ -199,15 +214,14 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) if (!order || !isfinite(gain) || gain < TNS_GAIN_THRESHOLD_LOW || gain > TNS_GAIN_THRESHOLD_HIGH) continue; - tns->n_filt[w] = is8 ? 1 : order != TNS_MAX_ORDER ? 2 : 3; + tns->n_filt[w] = n_filt; for (g = 0; g < tns->n_filt[w]; g++) { - tns->direction[w][g] = slant != 2 ? slant : en[g] < en[!g]; - tns->order[w][g] = g < tns->n_filt[w] ? order/tns->n_filt[w] : order - oc_start; - tns->length[w][g] = g < tns->n_filt[w] ? sfb_len/tns->n_filt[w] : sfb_len - os_start; + tns->direction[w][g] = slant != 2 ? slant : en[g] < en[g + 1]; + tns->order[w][g] = order/tns->n_filt[w]; + tns->length[w][g] = sfb_len/tns->n_filt[w]; quantize_coefs(&coefs[oc_start], tns->coef_idx[w][g], tns->coef[w][g], tns->order[w][g], c_bits); oc_start += tns->order[w][g]; - os_start += tns->length[w][g]; } count++; } commit ab45118cc7a78e82f623deaba18e4b4c65973914 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Tue Aug 19 03:12:37 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:22 2025 +0100 avcodec/dxv: Check coded_height, to avoid invalid av_clip() Fixes: assertion failure Fixes: 438961582/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_DEC_fuzzer-5850827739955200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit cdee519d40e61bd65ba5b3fbec00acd50a08d0d9) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index 2540ff67a8..e7d04ff957 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -1148,6 +1148,8 @@ static int dxv_decode(AVCodecContext *avctx, void *data, ctx->tex_rat = 1; break; } + if (avctx->coded_height / 2 / TEXTURE_BLOCK_H < 1) + return AVERROR_INVALIDDATA; ctx->slice_count = av_clip(avctx->thread_count, 1, avctx->coded_height / FFMAX(ctx->texture_block_h, commit c9323a8efc144285d85c7602ad87787024b9ea2e Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Aug 13 13:11:23 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:22 2025 +0100 avcodec/aac/aacdec: dont allow ff_aac_output_configure() allocating a new frame if it has no frame Fixes: null pointer dereference Fixes: crash_test.mp4 Found-by: Intel PSIRT Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit fcf180d9ea27b7dc29658c9dc3488ae6fac3ebd9) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 3d7f3257db..e18317f79a 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -539,6 +539,9 @@ static int output_configure(AACContext *ac, uint8_t id_map[TYPE_END][MAX_ELEM_ID] = {{ 0 }}; uint8_t type_counts[TYPE_END] = { 0 }; + if (get_new_frame && !ac->frame) + return AVERROR_INVALIDDATA; + if (ac->oc[1].layout_map != layout_map) { memcpy(ac->oc[1].layout_map, layout_map, tags * sizeof(layout_map[0])); ac->oc[1].layout_map_tags = tags; commit 9d304b823c9a1e01abf0c6b4f715424840a78f5e Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Mon Aug 18 17:20:49 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:22 2025 +0100 avformat/lrcdec: Fix fate-sub-lrc-ms-remux on x86-32 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 0243cf89b137b093b02a5c61a76e28cec1d69ae9) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/lrcdec.c b/libavformat/lrcdec.c index 7c273b7e1a..915b9ad36d 100644 --- a/libavformat/lrcdec.c +++ b/libavformat/lrcdec.c @@ -91,7 +91,7 @@ static int64_t read_ts(const char *p, int64_t *start) if (ret != 3 || prefix[0] != '[' || ss < 0 || ss > 60) { return 0; } - *start = (mm * 60 + ss) * AV_TIME_BASE; + *start = llrint((mm * 60 + ss) * AV_TIME_BASE); if (prefix[1] == '-') { *start = - *start; } commit b39f58aa95a22487402aedcf02f277e1fd30dba0 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Aug 17 15:31:48 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:22 2025 +0100 avcodec/sanm: Check w,h,left,top The setup code fow w,h,left,top is complex, the code using it also falls in at least 2 different classes, one using left/top the other not. To ensure no out of array access happens we add this clear check. Fixes: out of array access Fixes: 439261995/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SANM_fuzzer-5383455572819968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 134fbfd1dcb59441e38d870ddd231772f4e8e127) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index d0000ebd0c..fedb194874 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -974,6 +974,11 @@ static int process_frame_obj(SANMVideoContext *ctx) } bytestream2_skip(&ctx->gb, 4); + if (w + FFMAX(left, 0) > ctx->avctx->width || h + FFMAX(top, 0) > ctx->avctx->height) { + avpriv_request_sample(ctx->avctx, "overly large frame\n"); + return AVERROR_PATCHWELCOME; + } + switch (codec) { case 1: case 3: commit 91aca4595550bd99e025bcaea9aa01deaf1cce0f Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Aug 15 17:55:05 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:22 2025 +0100 avcodec/utvideodec: Clear plane_start array in pack mode the array is passed into decode_plane() without being initialized or used Fixes: use of uninitialized memory Fixes: 438780119/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_UTVIDEO_DEC_fuzzer-5464037027807232 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 2a22972db3b390d82dedbdbb5f44cc09a43912b5) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index c3eb83b47b..65ae623d3f 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -564,7 +564,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int buf_size = avpkt->size; UtvideoContext *c = avctx->priv_data; int i, j; - const uint8_t *plane_start[5]; + const uint8_t *plane_start[5] = {NULL}; int plane_size, max_slice_size = 0, slice_start, slice_end, slice_size; int ret; GetByteContext gb; commit 24531f73d22eaaa072fcc5d19a525fa8e3553a9b Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Aug 8 12:25:55 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:21 2025 +0100 avcodec/dxv: Check that we initialize op_data Fixes: 431665305/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_DEC_fuzzer-5339599339847680 Fixes: use of uninitialized memory Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 6a8c41dcacbba011e553fbf35518577321d1aadb) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index 69263cd30d..2540ff67a8 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -474,7 +474,9 @@ static int dxv_decompress_opcodes(GetByteContext *gb, void *dstp, size_t op_size if ((flag & 3) == 0) { bytestream2_skip(gb, 1); - bytestream2_get_buffer(gb, dstp, op_size); + int read_size = bytestream2_get_buffer(gb, dstp, op_size); + if (read_size != op_size) + return AVERROR_INVALIDDATA; } else if ((flag & 3) == 1) { bytestream2_skip(gb, 1); memset(dstp, bytestream2_get_byte(gb), op_size); commit 2a5e5b9cde94cd48545b613271c3affacd806e60 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sat Aug 9 14:05:19 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:21 2025 +0100 avcodec/exr: Check for pixel type consistency in DWA Fixes: out of array access Fixes: BIGSLEEP-436511754/testcase.exr Found-by: Google Big Sleep Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 0469d68acb52081ca8385b844b9650398242be0f) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 7e4e0a3261..bbf1cd9984 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -2075,6 +2075,16 @@ static int decode_frame(AVCodecContext *avctx, void *data, for (int i = 0; i < 4; i++) s->channel_offsets[i] *= 2; } + if (s->compression == EXR_DWAA || + s->compression == EXR_DWAB) { + for (int i = 0; i<s->nb_channels; i++) { + EXRChannel *channel = &s->channels[i]; + if (channel->pixel_type != s->pixel_type) { + avpriv_request_sample(s->avctx, "mixed pixel type DWA"); + return AVERROR_PATCHWELCOME; + } + } + } switch (s->pixel_type) { case EXR_FLOAT: commit 72973c98b622067f2fe23d53a09703d6b3c46939 Author: Kacper Michajłow <kasper93(a)gmail.com> AuthorDate: Sat Aug 9 17:09:57 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:21 2025 +0100 avcodec/g726: init missing sample rate Fixes: 416134551/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_G726_DEC_fuzzer-5695764455292928 Found-by: OSS-Fuzz Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> (cherry picked from commit c2f7dae70d27a8f5ca1e3fa43d96ff5c8bf032fa) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 71f5791416..88eab834d2 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -458,6 +458,8 @@ static av_cold int g726_decode_init(AVCodecContext *avctx) g726_reset(c); avctx->sample_fmt = AV_SAMPLE_FMT_S16; + if (!avctx->sample_rate) + avctx->sample_rate = 8000; return 0; } commit cf9ac939ce8fdcfeba0876772e5d06b9a12b1152 Author: Kacper Michajłow <kasper93(a)gmail.com> AuthorDate: Sat Aug 9 16:49:17 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:21 2025 +0100 avformat/lrcdec: limit input timestamp range to avoid overflows Fixes: clusterfuzz-testcase-ffmpeg_dem_LRC_fuzzer-5226140131459072 Found-by: OSS-Fuzz Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> (cherry picked from commit c74bc74398e7a1e235fdf51d0dd2dfb942626c82) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/lrcdec.c b/libavformat/lrcdec.c index 6273d88ae7..7c273b7e1a 100644 --- a/libavformat/lrcdec.c +++ b/libavformat/lrcdec.c @@ -77,7 +77,7 @@ static int64_t count_ts(const char *p) static int64_t read_ts(const char *p, int64_t *start) { int64_t offset = 0; - uint64_t mm; + uint32_t mm; double ss; char prefix[3]; @@ -87,8 +87,8 @@ static int64_t read_ts(const char *p, int64_t *start) if(p[offset] != '[') { return 0; } - int ret = sscanf(p, "%2[[-]%"SCNu64":%lf]", prefix, &mm, &ss); - if (ret != 3 || prefix[0] != '[') { + int ret = sscanf(p, "%2[[-]%"SCNu32":%lf]", prefix, &mm, &ss); + if (ret != 3 || prefix[0] != '[' || ss < 0 || ss > 60) { return 0; } *start = (mm * 60 + ss) * AV_TIME_BASE; commit 32a9aae14cd0b6ae3ed56bf11f07e2a6e1e3d9a6 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Aug 8 23:19:03 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:21 2025 +0100 avcodec/scpr3: Clear clr clr is passing into decode_run_p() its not used when not set but this possibly triggers msan (it doesnt locally) Fixes?: use of uninintialized memory Fixes?: 436997807/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-6253316466606080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 354226037646d44701f0f2a84749fb2ea303f043) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/scpr3.c b/libavcodec/scpr3.c index 85524feafe..7e0c066bfa 100644 --- a/libavcodec/scpr3.c +++ b/libavcodec/scpr3.c @@ -1168,7 +1168,7 @@ static int decompress_p3(AVCodecContext *avctx, } } else { int run, bx = x * 16 + sx1, by = y * 16 + sy1; - uint32_t clr, ptype = 0, r, g, b; + uint32_t clr = 0, ptype = 0, r, g, b; if (bx >= avctx->width) return AVERROR_INVALIDDATA; commit 6103d73dce4fac75f7113244efc7f6a1f24777ae Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Fri Aug 8 15:03:56 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:21 2025 +0100 avcodec/ilbcdec: Clear cbvec when used with create_augmented_vector() Fixes: use of uninitialized memory Fixes: 42538134/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ILBC_fuzzer-6322020827070464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 9686fdd729a9caeeac0dc84dca2a65e4c9e5460b) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c index 1aa6dddac8..87e7e82c82 100644 --- a/libavcodec/ilbcdec.c +++ b/libavcodec/ilbcdec.c @@ -670,6 +670,7 @@ static void get_codebook(int16_t * cbvec, /* (o) Constructed codebook vector * /* get vector */ memcpy(cbvec, mem + lMem - k, cbveclen * 2); } else if (index < base_size) { + memset(cbvec, 0, cbveclen * 2); /* Calculate lag */ @@ -696,6 +697,7 @@ static void get_codebook(int16_t * cbvec, /* (o) Constructed codebook vector * filter_mafq12(&mem[memIndTest + 4], cbvec, (int16_t *) kCbFiltersRev, CB_FILTERLEN, cbveclen); } else { + memset(cbvec, 0, cbveclen * 2); /* interpolated vectors */ /* Stuff zeros outside memory buffer */ memIndTest = lMem - cbveclen - CB_FILTERLEN; commit 39f4a60035085e7b1465fa7159d3ef03114dfe27 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sat Aug 9 11:38:07 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:20 2025 +0100 avcodec/jpeg2000dec: Make sure the 4 extra bytes allocated are initialized Fixes: use of uninitialized memory Fixes: 429130590/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_DEC_fuzzer-5736930522497024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit d6fe3786cd8c06437756d407f727ff01cf1774ff) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 8663bdb4c9..2fe35530a6 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1291,6 +1291,7 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, bytestream2_get_bufferu(&s->g, cblk->data + cblk->length, cblk->lengthinc[cwsno]); cblk->length += cblk->lengthinc[cwsno]; + memset(cblk->data + cblk->length, 0, 4); cblk->lengthinc[cwsno] = 0; if (cblk->nb_terminationsinc) { cblk->nb_terminationsinc--; commit 2838a74097cd0e6df76a4f2e6bf86cacbcad4a39 Author: Muhammad Faiz <mfcc64-at-gmail.com(a)ffmpeg.org> AuthorDate: Thu Jul 3 20:47:58 2025 +0700 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:20 2025 +0100 avfilter/avf_showcqt: fix unbounded index when copying to fft_data When timeclamp and/or fps are low, j can be negative. Fix Ticket11640 (cherry picked from commit 35ea45835484b90490e7d1704ef99ccb7b775578) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c index dba1f089ee..88681ec9b0 100644 --- a/libavfilter/avf_showcqt.c +++ b/libavfilter/avf_showcqt.c @@ -1513,7 +1513,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) i = insamples->nb_samples - remaining; j = s->fft_len/2 + s->remaining_fill_max - s->remaining_fill; if (remaining >= s->remaining_fill) { - for (m = 0; m < s->remaining_fill; m++) { + for (m = FFMAX(0, -j); m < s->remaining_fill; m++) { s->fft_data[j+m].re = audio_data[2*(i+m)]; s->fft_data[j+m].im = audio_data[2*(i+m)+1]; } @@ -1547,7 +1547,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) s->fft_data[m] = s->fft_data[m+step]; s->remaining_fill = step; } else { - for (m = 0; m < remaining; m++) { + for (m = FFMAX(0, -j); m < remaining; m++) { s->fft_data[j+m].re = audio_data[2*(i+m)]; s->fft_data[j+m].im = audio_data[2*(i+m)+1]; } commit bfd4b415be8b5cb2ace7676bc266f0d690a38575 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun May 11 00:58:26 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:20 2025 +0100 avcodec/aacsbr_template: Check ilb Fixes: index 50 out of bounds for type 'INTFLOAT [40][2]' Fixes: 401661737/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-4866055713652736 Someone knowing AAC well should review this, there is likely a nicer fix Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 01a1b99fc2ccdf713abfa5203e36fbf5816e1b5f) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index 04ab2f1e36..9c65119344 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -1430,6 +1430,9 @@ static void sbr_env_estimate(AAC_FLOAT (*e_curr)[48], INTFLOAT X_high[64][40][2] int ilb = ch_data->t_env[e] * 2 + ENVELOPE_ADJUSTMENT_OFFSET; int iub = ch_data->t_env[e + 1] * 2 + ENVELOPE_ADJUSTMENT_OFFSET; + if (ilb >= 40) + return; + for (m = 0; m < sbr->m[1]; m++) { AAC_FLOAT sum = sbr->dsp.sum_square(X_high[m+kx1] + ilb, iub - ilb); #if USE_FIXED @@ -1448,6 +1451,9 @@ static void sbr_env_estimate(AAC_FLOAT (*e_curr)[48], INTFLOAT X_high[64][40][2] int iub = ch_data->t_env[e + 1] * 2 + ENVELOPE_ADJUSTMENT_OFFSET; const uint16_t *table = ch_data->bs_freq_res[e + 1] ? sbr->f_tablehigh : sbr->f_tablelow; + if (ilb >= 40) + return; + for (p = 0; p < sbr->n[ch_data->bs_freq_res[e + 1]]; p++) { #if USE_FIXED SoftFloat sum = FLOAT_0; commit a1b6585b74e0ca64b4aefd0e5fe4d357a559fc88 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Aug 6 13:09:26 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:20 2025 +0100 avcodec/utvideodec: Set B for the width= 1 case Fixes: use of uninitialized meory Fixes: 428034093/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_UTVIDEO_DEC_fuzzer-6195630160805888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 032dfe8584c4675f3253ebb5e333e834f55f7562) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 1b10b3bd06..c3eb83b47b 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -381,7 +381,7 @@ static void restore_median_planar(UtvideoContext *c, uint8_t *src, ptrdiff_t str // second line - first element has top prediction, the rest uses median C = bsrc[-stride]; bsrc[0] += C; - A = bsrc[0]; + A = B = bsrc[0]; for (i = 1; i < FFMIN(width, 16); i++) { /* scalar loop (DSP need align 16) */ B = bsrc[i - stride]; bsrc[i] += mid_pred(A, B, (uint8_t)(A + B - C)); commit 85eda6ff84a027543e4d1712a261a26a63188667 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Aug 6 13:36:06 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:20 2025 +0100 avcodec/ffv1: Clear state on alloc Fixes: use of uninitialized memory Fixes: 428969823/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_DEC_fuzzer-5909681623334912 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 70fc46d185663dbea0995bf868d66b58b388119e) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 56a8fb847e..4796916300 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -74,7 +74,7 @@ av_cold int ff_ffv1_init_slice_state(FFV1Context *f, FFV1Context *fs) if (fs->ac != AC_GOLOMB_RICE) { if (!p->state) - p->state = av_malloc_array(p->context_count, CONTEXT_SIZE * + p->state = av_calloc(p->context_count, CONTEXT_SIZE * sizeof(uint8_t)); if (!p->state) return AVERROR(ENOMEM); commit eb80096cbe8b11105f7be0eb99233667e8836c1a Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Tue Aug 5 23:42:23 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:19 2025 +0100 avcodec/jpeg2000dec: implement cdef remapping during pixel format matching Fixes: out of array access Fixes: poc.jp2 Found-by: Andy Nguyen <theflow(a)google.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 01a292c7e36545ddeb3c7f79cd02e2611cd37d73) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 197dc86965..8663bdb4c9 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -357,6 +357,14 @@ static int get_siz(Jpeg2000DecoderContext *s) } // after here we no longer have to consider negative cdef + int cdef_used = 0; + for (i = 0; i < s->ncomponents; i++) + cdef_used |= 1<<s->cdef[i]; + + // Check that the channels we have are what we expect for the number of components + if (cdef_used != ((int[]){0,2,3,14,15})[s->ncomponents]) + return AVERROR_INVALIDDATA; + for (i = 0; i < s->ncomponents; i++) { // Ssiz_i XRsiz_i, YRsiz_i uint8_t x = bytestream2_get_byteu(&s->g); s->cbps[i] = (x & 0x7f) + 1; @@ -369,7 +377,9 @@ static int get_siz(Jpeg2000DecoderContext *s) av_log(s->avctx, AV_LOG_ERROR, "Invalid sample separation %d/%d\n", s->cdx[i], s->cdy[i]); return AVERROR_INVALIDDATA; } - log2_chroma_wh |= s->cdy[i] >> 1 << i * 4 | s->cdx[i] >> 1 << i * 4 + 2; + int i_remapped = s->cdef[i] ? s->cdef[i]-1 : (s->ncomponents-1); + + log2_chroma_wh |= s->cdy[i] >> 1 << i_remapped * 4 | s->cdx[i] >> 1 << i_remapped * 4 + 2; } s->numXtiles = ff_jpeg2000_ceildiv(s->width - s->tile_offset_x, s->tile_width); commit de97cc3892f9655e292af8d7d235f2c1eb77b3b7 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Tue Aug 5 23:18:47 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:19 2025 +0100 avcodec/jpeg2000dec: move cdef default check into get_siz() This way cdef is at its final value earlier Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 104d6846c1be0cb757dc95d5801a416f4d7c687d) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 9b3654dbc6..197dc86965 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -346,6 +346,17 @@ static int get_siz(Jpeg2000DecoderContext *s) return AVERROR_INVALIDDATA; } + for (i = 0; i < s->ncomponents; i++) { + if (s->cdef[i] < 0) { + for (i = 0; i < s->ncomponents; i++) { + s->cdef[i] = i + 1; + } + if ((s->ncomponents & 1) == 0) + s->cdef[s->ncomponents-1] = 0; + } + } + // after here we no longer have to consider negative cdef + for (i = 0; i < s->ncomponents; i++) { // Ssiz_i XRsiz_i, YRsiz_i uint8_t x = bytestream2_get_byteu(&s->g); s->cbps[i] = (x & 0x7f) + 1; commit f86359ec440f3462df0e7cf10cc9e95d959167d8 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Aug 6 10:08:14 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:19 2025 +0100 avcodec/exr: Check rle_raw_data and surroundings Fixes: out of array read Fixes: BIGSLEEP-436510153/dwa_uncompress_read.exr Found-by: Google Big Sleep Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 0d9c003d76383e82b57b6d5aa33776709d0cda2c) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 93528084a6..7e4e0a3261 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -998,6 +998,7 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size const int dc_h = td->ysize >> 3; GetByteContext gb, agb; int skip, ret; + int have_rle = 0; if (compressed_size <= 88) return AVERROR_INVALIDDATA; @@ -1022,6 +1023,11 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size ) return AVERROR_INVALIDDATA; + if ((uint64_t)rle_raw_size > INT_MAX) { + avpriv_request_sample(s->avctx, "Too big rle_raw_size"); + return AVERROR_INVALIDDATA; + } + bytestream2_init(&gb, src + 88, compressed_size - 88); skip = bytestream2_get_le16(&gb); if (skip < 2) @@ -1092,6 +1098,9 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size if (rle_raw_size > 0 && rle_csize > 0 && rle_usize > 0) { unsigned long dest_len = rle_usize; + if (2LL * td->xsize * td->ysize > rle_raw_size) + return AVERROR_INVALIDDATA; + av_fast_padded_malloc(&td->rle_data, &td->rle_size, rle_usize); if (!td->rle_data) return AVERROR(ENOMEM); @@ -1108,6 +1117,8 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size if (ret < 0) return ret; bytestream2_skip(&gb, rle_csize); + + have_rle = 1; } bytestream2_init(&agb, td->ac_data, ac_count * 2); @@ -1168,7 +1179,7 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size if (s->nb_channels < 4) return 0; - for (int y = 0; y < td->ysize && td->rle_raw_data; y++) { + for (int y = 0; y < td->ysize && have_rle; y++) { uint32_t *ao = ((uint32_t *)td->uncompressed_data) + y * td->xsize * s->nb_channels; uint8_t *ai0 = td->rle_raw_data + y * td->xsize; uint8_t *ai1 = td->rle_raw_data + y * td->xsize + rle_raw_size / 2; commit 713e086aff3a83eb357c69a4909cac379d4b37dc Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Aug 6 10:35:15 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:19 2025 +0100 avcodec/exr: Dont access outside xsize/ysize Fixes: out of array access Fixes: BIGSLEEP-436510316/dwa_uncompress_write.exr Found-by: Google Big Sleep Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit f45da79b2c336c5f8f3e563d72b8a22fecdcde0c) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/exr.c b/libavcodec/exr.c index e3585e85fa..93528084a6 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1114,6 +1114,9 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size for (int y = 0; y < td->ysize; y += 8) { for (int x = 0; x < td->xsize; x += 8) { + int bw = FFMIN(8, td->xsize - x); + int bh = FFMIN(8, td->ysize - y); + memset(td->block, 0, sizeof(td->block)); for (int j = 0; j < 3; j++) { @@ -1143,8 +1146,8 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size float *ub = td->block[1]; float *vb = td->block[2]; - for (int yy = 0; yy < 8; yy++) { - for (int xx = 0; xx < 8; xx++) { + for (int yy = 0; yy < bh; yy++) { + for (int xx = 0; xx < bw; xx++) { const int idx = xx + yy * 8; convert(yb[idx], ub[idx], vb[idx], &bo[xx], &go[xx], &ro[xx]); commit 013d39a06cddaa177ed7d0ec8df5d0dfb69e0a9d Author: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> AuthorDate: Wed Aug 6 14:54:22 2025 +0000 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:19 2025 +0100 examples: Add check and replace av_free() to avoid potential memory errors Add check for the return value of av_packet_alloc() to avoid potential NULL pointer dereference. Moreover, replace redundant av_free() with fprintf(). Fixes: 9a38184a14 ("examples/decode_audio: allocate the packet dynamically") Signed-off-by: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> Reviewed-by: Nicolas George <george(a)nsup.org> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit c64cff64a22a59c0c02281ee9fd9d89963d14d16) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/doc/examples/decode_audio.c b/doc/examples/decode_audio.c index 6c2a8ed550..36fc3668e2 100644 --- a/doc/examples/decode_audio.c +++ b/doc/examples/decode_audio.c @@ -127,6 +127,10 @@ int main(int argc, char **argv) outfilename = argv[2]; pkt = av_packet_alloc(); + if (!pkt) { + fprintf(stderr, "Could not allocate AVPacket\n"); + exit(1); /* or proper cleanup and returning */ + } /* find the MPEG audio decoder */ codec = avcodec_find_decoder(AV_CODEC_ID_MP2); @@ -160,7 +164,7 @@ int main(int argc, char **argv) } outfile = fopen(outfilename, "wb"); if (!outfile) { - av_free(c); + fprintf(stderr, "Could not open %s\n", outfilename); exit(1); } commit dc9780ac6850ddf839f1ac6cb7cfcf4d70e38a15 Author: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> AuthorDate: Sun Aug 3 23:31:27 2025 +0000 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:19 2025 +0100 libavcodec/tests/snowenc: Add av_free() to avoid memory leak Add av_free() to free s.temp_dwt_buffer and s.temp_idwt_buffer at the end of the function to avoid memory leak. Fixes: 5d48e4eafa ("Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'") Signed-off-by: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 446cfbfb7446208bd1592bbc0ac18ac744543563) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/tests/snowenc.c b/libavcodec/tests/snowenc.c index 65699158ca..c90933be3b 100644 --- a/libavcodec/tests/snowenc.c +++ b/libavcodec/tests/snowenc.c @@ -44,7 +44,8 @@ int main(void){ if (!s.temp_dwt_buffer || !s.temp_idwt_buffer) { fprintf(stderr, "Failed to allocate memory\n"); - return 1; + ret = 1; + goto end; } av_lfg_init(&prng, 1); @@ -155,5 +156,9 @@ int main(void){ } } + +end: + av_free(s.temp_dwt_buffer); + av_free(s.temp_idwt_buffer); return ret; } commit c1a253b002c83f276ad9407b2257c3e7c1b5e3f7 Author: Kacper Michajłow <kasper93(a)gmail.com> AuthorDate: Wed Aug 6 19:49:11 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:18 2025 +0100 avcodec/mpc8: init avctx->sample_rate Fixes frame validation. Fixes: 416134551/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPC8_fuzzer-5765557242888192 Found-by: OSS-Fuzz Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> (cherry picked from commit 09cb2d41d1862c2f9b3b66311ede28527d703700) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index e9919aea62..5c5a26f315 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -154,7 +154,13 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx) init_get_bits(&gb, avctx->extradata, 16); - skip_bits(&gb, 3);//sample rate + uint8_t sample_rate_idx = get_bits(&gb, 3); + static const int sample_rates[] = { 44100, 48000, 37800, 32000 }; + if (sample_rate_idx >= FF_ARRAY_ELEMS(sample_rates)) { + av_log(avctx, AV_LOG_ERROR, "invalid sample rate index (%u)\n", sample_rate_idx); + return AVERROR_INVALIDDATA; + } + avctx->sample_rate = sample_rates[sample_rate_idx]; c->maxbands = get_bits(&gb, 5) + 1; if (c->maxbands >= BANDS) { av_log(avctx,AV_LOG_ERROR, "maxbands %d too high\n", c->maxbands); commit 5bcb05cc16846edfc54cd20cff0ff4aa187d0aec Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sat Aug 2 18:55:26 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:18 2025 +0100 avformat/hls: add cmfv/cmfa exceptions Fixes: Ticket11526 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit f3c3a6ecfb230c56a8ff9d219d79d5981b2aa4f3) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/hls.c b/libavformat/hls.c index fdec350a4d..f98504df2c 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -735,8 +735,8 @@ static int test_segment(AVFormatContext *s, const AVInputFormat *in_fmt, struct + 2*(ff_match_url_ext(seg->url, in_fmt->extensions) > 0); // Youtube uses aac files with .ts extension if(av_match_name("mp4", in_fmt->name) || av_match_name("aac", in_fmt->name)) { - matchF |= av_match_ext( seg->url, "ts,m2t,m2ts,mts,mpg,m4s,mpeg,mpegts") - + 2*(ff_match_url_ext(seg->url, "ts,m2t,m2ts,mts,mpg,m4s,mpeg,mpegts") > 0); + matchF |= av_match_ext( seg->url, "ts,m2t,m2ts,mts,mpg,m4s,mpeg,mpegts,cmfv,cmfa") + + 2*(ff_match_url_ext(seg->url, "ts,m2t,m2ts,mts,mpg,m4s,mpeg,mpegts,cmfv,cmfa") > 0); } } else if (!strcmp(in_fmt->name, "mpegts")) { const char *str = "ts,m2t,m2ts,mts,mpg,m4s,mpeg,mpegts" commit 972d098319ededd2ea94c5103b2d347faa0e2118 Author: Kacper Michajłow <kasper93(a)gmail.com> AuthorDate: Wed Jul 23 20:04:53 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:18 2025 +0100 avformat/lrcdec: support arbitrary precision timestamp Apparently files with milliseconds exist in the wild. And since it cost nothing to support arbitrary number of digits, extend format to support that. Depending on number of digits, the time base of fractional part is changing. Most LRCs use 2 digits and centiseconds base, but subs with 3 digits and miliseconds exist too. Set internal time base to AV_TIME_BASE, which in parcitice allows to hold microseconds with 6 digits. Totally artificial, but who knows maybe someone wants that. Fixes: #11677 Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> (cherry picked from commit bc3cc0a6af44adc63caf4e5097fcfebd7a7475b4) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/lrcdec.c b/libavformat/lrcdec.c index ca23a60f84..6273d88ae7 100644 --- a/libavformat/lrcdec.c +++ b/libavformat/lrcdec.c @@ -77,7 +77,9 @@ static int64_t count_ts(const char *p) static int64_t read_ts(const char *p, int64_t *start) { int64_t offset = 0; - uint64_t mm, ss, cs; + uint64_t mm; + double ss; + char prefix[3]; while(p[offset] == ' ' || p[offset] == '\t') { offset++; @@ -85,14 +87,14 @@ static int64_t read_ts(const char *p, int64_t *start) if(p[offset] != '[') { return 0; } - if(sscanf(p, "[-%"SCNu64":%"SCNu64".%"SCNu64"]", &mm, &ss, &cs) == 3) { - /* Just in case negative pts, players may drop it but we won't. */ - *start = -(int64_t) (mm*60000 + ss*1000 + cs*10); - } else if(sscanf(p, "[%"SCNu64":%"SCNu64".%"SCNu64"]", &mm, &ss, &cs) == 3) { - *start = mm*60000 + ss*1000 + cs*10; - } else { + int ret = sscanf(p, "%2[[-]%"SCNu64":%lf]", prefix, &mm, &ss); + if (ret != 3 || prefix[0] != '[') { return 0; } + *start = (mm * 60 + ss) * AV_TIME_BASE; + if (prefix[1] == '-') { + *start = - *start; + } do { offset++; } while(p[offset] && p[offset-1] != ']'); @@ -163,7 +165,7 @@ static int lrc_read_header(AVFormatContext *s) if(!st) { return AVERROR(ENOMEM); } - avpriv_set_pts_info(st, 64, 1, 1000); + avpriv_set_pts_info(st, 64, 1, AV_TIME_BASE); lrc->ts_offset = 0; st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codecpar->codec_id = AV_CODEC_ID_TEXT; commit 902c725b2cfce8126c8f397e8a7a794ab1cd932e Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Mon Aug 4 21:08:47 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:18 2025 +0100 avcodec/ffv1dec: Disable frame threading due to race condition Slice threading remains available! The race condition fix is in 8d5efc218245c3f0559f48837b3e63e2932525e0 and bcf08c11710cab5db8eb3d0774e1a93e322fb821 Backport of these is welcome Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index eb2f29989a..8fb1509f16 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -1091,6 +1091,6 @@ AVCodec ff_ffv1_decoder = { .decode = decode_frame, .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/ | - AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_ALLOCATE_PROGRESS, + AV_CODEC_CAP_SLICE_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; commit 8c03e1112beef9e251b46c14fe7b1baa1225a12f Author: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> AuthorDate: Sun Aug 3 20:32:23 2025 +0000 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:18 2025 +0100 libavcodec/tests/motion: Add check for avcodec_alloc_context3() Add check for the return value of avcodec_alloc_context3() to avoid potential NULL pointer dereference. Fixes: 5d48e4eafa ("Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'") Signed-off-by: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 55d234b4330d1588eb127cf2283a442ee341f2c2) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/tests/motion.c b/libavcodec/tests/motion.c index d89f9408c2..321e03d4f6 100644 --- a/libavcodec/tests/motion.c +++ b/libavcodec/tests/motion.c @@ -127,6 +127,10 @@ int main(int argc, char **argv) printf("ffmpeg motion test\n"); ctx = avcodec_alloc_context3(NULL); + if (!ctx) { + return 1; + } + ctx->flags |= AV_CODEC_FLAG_BITEXACT; av_force_cpu_flags(0); memset(&cctx, 0, sizeof(cctx)); commit 74f0280dca9f8e9b4b3b2f627f440ba5c59f7406 Author: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> AuthorDate: Sun Aug 3 19:14:38 2025 +0000 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:18 2025 +0100 avcodec/tests/avpacket: Add av_free() to avoid memory leak Add av_free() to free extra_data if av_packet_add_side_data() fails. Fixes: da3c69a5a9 ("Added test for libavcodec/avpacket.c") Signed-off-by: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 008679ec162d1769afd706af5b1ce7a593f13f2b) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/tests/avpacket.c b/libavcodec/tests/avpacket.c index 8b209f52f7..1d7cc8c450 100644 --- a/libavcodec/tests/avpacket.c +++ b/libavcodec/tests/avpacket.c @@ -50,6 +50,7 @@ static int setup_side_data_entry(AVPacket* avpkt) ret = av_packet_add_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, extra_data, bytes); if(ret < 0){ + av_free(extra_data); fprintf(stderr, "Error occurred in av_packet_add_side_data: %s\n", av_err2str(ret)); commit 4ee4b85123b50a6c57d6bc6c63dc0617e78a75e0 Author: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> AuthorDate: Sat Aug 2 23:28:48 2025 +0000 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:17 2025 +0100 examples: Add av_freep to avoid potential memory leak Add av_freep() to free avio_ctx_buffer if avio_alloc_context fails to avoid potential memory leak. Fixes: 5fc4dea39c ("examples: add avio_reading.c example") Signed-off-by: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 9ca58424ded24e931fed329174c28244b67d5670) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/doc/examples/avio_reading.c b/doc/examples/avio_reading.c index 36ee02afa5..0840e77f2e 100644 --- a/doc/examples/avio_reading.c +++ b/doc/examples/avio_reading.c @@ -96,6 +96,7 @@ int main(int argc, char *argv[]) avio_ctx = avio_alloc_context(avio_ctx_buffer, avio_ctx_buffer_size, 0, &bd, &read_packet, NULL, NULL); if (!avio_ctx) { + av_freep(&avio_ctx_buffer); ret = AVERROR(ENOMEM); goto end; } commit 78dfb98f7d670b7a25bd00db4965151eabced39c Author: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> AuthorDate: Sun Aug 3 20:09:38 2025 +0000 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:17 2025 +0100 avcodec/tests/avpacket: Add av_packet_free() to avoid memory leak Add av_packet_free() to free avpkt_clone and avpkt in the error paths to avoid potential memory leak. Fixes: da3c69a5a9 ("Added test for libavcodec/avpacket.c") Signed-off-by: Jiasheng Jiang <jiashengjiangcool(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit ab040e25657436e88a62624b3751a583dfe4e123) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/tests/avpacket.c b/libavcodec/tests/avpacket.c index 7a70ade4c3..8b209f52f7 100644 --- a/libavcodec/tests/avpacket.c +++ b/libavcodec/tests/avpacket.c @@ -100,11 +100,14 @@ int main(void) if(!avpkt_clone) { av_log(NULL, AV_LOG_ERROR,"av_packet_clone failed to clone AVPacket\n"); + av_packet_free(&avpkt); return 1; } /*test av_grow_packet*/ if(av_grow_packet(avpkt_clone, 20) < 0){ av_log(NULL, AV_LOG_ERROR, "av_grow_packet failed\n"); + av_packet_free(&avpkt_clone); + av_packet_free(&avpkt); return 1; } if(av_grow_packet(avpkt_clone, INT_MAX) == 0){ commit bd715593734bc7fc92b478e3b3d9a9104e9451ff Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Aug 3 01:47:54 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:17 2025 +0100 avcodec/fits: Clear naxis Fixes: Use of uninitialized memory Fixes: 423673969/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FITS_DEC_fuzzer-5602250833854464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 1687daa93c131f929495c7ab0509d2e5c98b40f5) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/fits.c b/libavcodec/fits.c index 97fa7abe80..c14856c27e 100644 --- a/libavcodec/fits.c +++ b/libavcodec/fits.c @@ -27,6 +27,8 @@ int avpriv_fits_header_init(FITSHeader *header, FITSHeaderState state) { header->state = state; header->naxis_index = 0; + header->naxis = 0; + memset(header->naxisn, 0, sizeof(header->naxisn)); header->blank_found = 0; header->pcount = 0; header->gcount = 1; commit 4c41f132f411aae967a990d94a0dd47f91aa355c Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Aug 3 14:52:36 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:17 2025 +0100 avcodec/vqavideo; Check bytestream2_get_buffer() reading next_codebook_buffer Fixes: use of uninintilaized memory Fixes: 423673969/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VQA_fuzzer-6235973619351552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 44864dbbb9b87d13d8f4ec92fb8536be0f9dbbc4) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index d0e1927444..4fae3449f8 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -551,8 +551,9 @@ static int vqa_decode_chunk(VqaContext *s, AVFrame *frame) } /* accumulate partial codebook */ - bytestream2_get_buffer(&s->gb, &s->next_codebook_buffer[s->next_codebook_buffer_index], - chunk_size); + if (chunk_size != bytestream2_get_buffer(&s->gb, &s->next_codebook_buffer[s->next_codebook_buffer_index], + chunk_size)) + return AVERROR_INVALIDDATA; s->next_codebook_buffer_index += chunk_size; s->partial_countdown--; @@ -580,8 +581,9 @@ static int vqa_decode_chunk(VqaContext *s, AVFrame *frame) } /* accumulate partial codebook */ - bytestream2_get_buffer(&s->gb, &s->next_codebook_buffer[s->next_codebook_buffer_index], - chunk_size); + if (chunk_size != bytestream2_get_buffer(&s->gb, &s->next_codebook_buffer[s->next_codebook_buffer_index], + chunk_size)) + return AVERROR_INVALIDDATA; s->next_codebook_buffer_index += chunk_size; s->partial_countdown--; commit 50a56ba2ee9984d124a93afdb4f3a5d13bb5617d Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Aug 3 08:33:40 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:17 2025 +0100 avcodec/lzf: Check for input space Fixes: use of uninitialized memory Fixes: 423673969/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NOTCHLC_fuzzer-5597015691296768 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 610d368d9bc3f1b7073a0b33e352f8bd7db24c7e) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/lzf.c b/libavcodec/lzf.c index 1e3c86c88c..94b369dd59 100644 --- a/libavcodec/lzf.c +++ b/libavcodec/lzf.c @@ -56,7 +56,10 @@ int ff_lzf_uncompress(GetByteContext *gb, uint8_t **buf, int64_t *size) p = *buf + len; } - bytestream2_get_buffer(gb, p, s); + int s2 = bytestream2_get_buffer(gb, p, s); + if (s2 != s) + return AVERROR_INVALIDDATA; + p += s; len += s; } else { commit 12a3bca16f317e52d79ac0eaa3217dd5986638db Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Aug 3 14:39:53 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:16 2025 +0100 avcodec/imc: Clear padding of buf16 Fixes: use of uninitialized memory Fixes: 423673969/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IAC_fuzzer-6685890556788736 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 715df4b1ff398758ca1b8a82c3d16940bc63fc56) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 51e7c1b2e1..7630776c11 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -1031,6 +1031,8 @@ static int imc_decode_frame(AVCodecContext *avctx, void *data, LOCAL_ALIGNED_16(uint16_t, buf16, [(IMC_BLOCK_SIZE + AV_INPUT_BUFFER_PADDING_SIZE) / 2]); + memset(buf16 + IMC_BLOCK_SIZE/2, 0, AV_INPUT_BUFFER_PADDING_SIZE); + q->avctx = avctx; if (buf_size < IMC_BLOCK_SIZE * avctx->channels) { commit 736acc71a70a7c04f0d2afa0c277fb012fb0a5b6 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Aug 3 14:34:59 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:16 2025 +0100 avcodec/cri: Check bytestream2_get_buffer() for end Fixes: use of uninintialized memory Fixes: 423673969/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CRI_fuzzer-5910856640823296 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit ea3851bebf91a96b11d16be2b36bf88111e30e36) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/cri.c b/libavcodec/cri.c index f6e8a4455d..3059336932 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -224,7 +224,8 @@ static int cri_decode_frame(AVCodecContext *avctx, void *data, break; case 102:; int read_len = FFMIN(length, sizeof(codec_name) - 1); - bytestream2_get_buffer(gb, codec_name, read_len)) + if (read_len != bytestream2_get_buffer(gb, codec_name, read_len)) + return AVERROR_INVALIDDATA; length -= read_len; if (strncmp(codec_name, "cintel_craw", read_len)) return AVERROR_INVALIDDATA; commit da19447883a39d0469f75e4cd1d064c184d5e992 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Aug 3 14:34:25 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:16 2025 +0100 avcodec/cri: Factor read_len out Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit d9bf3c141bb96dd285477278400b8349e9f964b0) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/cri.c b/libavcodec/cri.c index d2d80b6f1c..f6e8a4455d 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -222,10 +222,11 @@ static int cri_decode_frame(AVCodecContext *avctx, void *data, if (bytestream2_get_le32(gb) != 0) return AVERROR_INVALIDDATA; break; - case 102: - bytestream2_get_buffer(gb, codec_name, FFMIN(length, sizeof(codec_name) - 1)); - length -= FFMIN(length, sizeof(codec_name) - 1); - if (strncmp(codec_name, "cintel_craw", FFMIN(length, sizeof(codec_name) - 1))) + case 102:; + int read_len = FFMIN(length, sizeof(codec_name) - 1); + bytestream2_get_buffer(gb, codec_name, read_len)) + length -= read_len; + if (strncmp(codec_name, "cintel_craw", read_len)) return AVERROR_INVALIDDATA; compressed = 1; goto skip; commit 8c3bc258e34993d3dcc52ff1c1b2fa725f63891f Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Mon Jul 28 23:41:56 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:16 2025 +0100 avformat/dashdec: Allocate space for appended "/" Fixes: writing 1 byte over the end of the array Fixes: BIGSLEEP-433502298/test.xml Found-by: Google Big Sleep A prettier solution is welcome! A testcase exists only for the baseurl case Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit ce0a655f85c1144d19a4acad59afbb92e4997e30) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index c9871aaf9a..1126fdd987 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -730,7 +730,7 @@ static int resolve_content_path(AVFormatContext *s, const char *url, int *max_ur } tmp_max_url_size = aligned(tmp_max_url_size); - text = av_mallocz(tmp_max_url_size); + text = av_mallocz(tmp_max_url_size + 1); if (!text) { updated = AVERROR(ENOMEM); goto end; @@ -742,7 +742,7 @@ static int resolve_content_path(AVFormatContext *s, const char *url, int *max_ur } av_free(text); - path = av_mallocz(tmp_max_url_size); + path = av_mallocz(tmp_max_url_size + 2); tmp_str = av_mallocz(tmp_max_url_size); if (!tmp_str || !path) { updated = AVERROR(ENOMEM); @@ -764,6 +764,15 @@ static int resolve_content_path(AVFormatContext *s, const char *url, int *max_ur node = baseurl_nodes[rootId]; baseurl = xmlNodeGetContent(node); + if (baseurl) { + size_t len = xmlStrlen(baseurl)+2; + char *tmp = xmlRealloc(baseurl, len); + if (!tmp) { + updated = AVERROR(ENOMEM); + goto end; + } + baseurl = tmp; + } root_url = (av_strcasecmp(baseurl, "")) ? baseurl : path; if (node) { xmlNodeSetContent(node, root_url); commit fcf31af212cf98bf886ca359ab3334b29c358474 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Thu Jul 24 01:05:40 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:16 2025 +0100 avformat/mxg: clear AV_INPUT_BUFFER_PADDING_SIZE Fixes: use of uninitialized memory Fixes: 427532813/clusterfuzz-testcase-minimized-ffmpeg_dem_MXG_fuzzer-5661938917113856 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 1b12e919cfe3bf69038225794330d14575fb78d0) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/mxg.c b/libavformat/mxg.c index fe5879ecf0..6f9a4446d5 100644 --- a/libavformat/mxg.c +++ b/libavformat/mxg.c @@ -126,6 +126,8 @@ static int mxg_update_cache(AVFormatContext *s, unsigned int cache_size) mxg->cache_size += ret; + memset(mxg->buffer_ptr + mxg->cache_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + return ret; } commit e3d695473d95fe8e23df6a5dadb1a802854471da Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Jul 23 13:16:33 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:16 2025 +0100 avformat/mov: make sure file_checksum is fully initialized Fixes: use of uninitialized memory Fixes: 394990189/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6431722199908352 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 8b16e1ddd9c0bc4ca90447d481186216cfdce0fe) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/mov.c b/libavformat/mov.c index b03a8f8295..414e7fa7c0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1018,7 +1018,9 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_read(pb, output, 8); // go to offset 8, absolute position 0x251 avio_read(pb, input, DRM_BLOB_SIZE); avio_read(pb, output, 4); // go to offset 4, absolute position 0x28d - avio_read(pb, file_checksum, 20); + ret = ffio_read_size(pb, file_checksum, 20); + if (ret < 0) + goto fail; av_log(c->fc, AV_LOG_INFO, "[aax] file checksum == "); // required by external tools for (i = 0; i < 20; i++) commit 5339f20be22d4290876fcfd6b2afb2c35f1f0593 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Jul 23 01:57:54 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:15 2025 +0100 avformat/asfdec_f: Check amount of value read Fixes: use of uninitialized memory Fixes: 403675492/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_fuzzer-4754281823797248 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit fa197924a66d83106c5d4dadb8610a1c526afd67) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index f0b1639b21..0c451274a9 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -340,8 +340,10 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len, int case ASF_UNICODE: avio_get_str16le(s->pb, len, value, 2 * len + 1); break; - case -1: // ASCI - avio_read(s->pb, value, len); + case -1:; // ASCII + int ret = ffio_read_size(s->pb, value, len); + if (ret < 0) + goto finish; value[len]=0; break; case ASF_BYTE_ARRAY: commit 75d6f80fd210bbcb6a7979f58f06e9323097ba2e Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Jul 13 03:10:27 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:15 2025 +0100 avformat/concatdec: Clip duration in one more case in get_best_effort_duration() Fixes: signed integer overflow: 40000 - -9223372036854770000 cannot be represented in type 'long' Fixes: 427262541/clusterfuzz-testcase-minimized-ffmpeg_dem_CONCAT_fuzzer-4831506940100608 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Nicolas George <george(a)nsup.org> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 8cdb47e47a7a53a3c635a71bf712d79119eb86b4) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index d45e52d7c6..069b5fe2aa 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -319,7 +319,7 @@ static int64_t get_best_effort_duration(ConcatFile *file, AVFormatContext *avf) if (file->outpoint != AV_NOPTS_VALUE) return av_sat_sub64(file->outpoint, file->file_inpoint); if (avf->duration > 0) - return avf->duration - (file->file_inpoint - file->file_start_time); + return av_sat_sub64(avf->duration, file->file_inpoint - file->file_start_time); if (file->next_dts != AV_NOPTS_VALUE) return file->next_dts - file->file_inpoint; return AV_NOPTS_VALUE; commit da9ef71013d7b975795a8778f806f1d470c83373 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Jul 16 00:01:07 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:15 2025 +0100 avcodec/ffv1dec: Check k in get_vlc_symbol() The true problem happens in several previous get_vlc_symbol() but checking that is more expensive (involving FFABS()) here its just a simple check between 2 variables we have. Fixes: Assertion log >= k failed at libavcodec/golomb.h:406 Fixes: 429296194/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_DEC_fuzzer-4691594622337024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 051e0d7744dbb45f680bbfa72bfead947b11ef2f) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 0be1c94bb2..eb2f29989a 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -78,6 +78,11 @@ static inline int get_vlc_symbol(GetBitContext *gb, VlcState *const state, k++; i += i; } + if (k > bits) { + ff_dlog(NULL, "k-overflow bias:%d error:%d drift:%d count:%d k:%d", + state->bias, state->error_sum, state->drift, state->count, k); + k = bits; + } v = get_sr_golomb(gb, k, 12, bits); ff_dlog(NULL, "v:%d bias:%d error:%d drift:%d count:%d k:%d", commit 916ede06b72a422bbda8b9be254e430139af13de Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Tue Jul 15 22:19:24 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:15 2025 +0100 avcodec/cfhd: Check idwt_buf size before allocation Fixes: OOM Fixes: 428760799/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_DEC_fuzzer-5685176435015680 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 2d72bf6fe0793c3f069ba181a0e733dcc9f28180) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index b61d1e7222..39dd2d7bf2 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -274,6 +274,9 @@ static int alloc_buffers(AVCodecContext *avctx) int height = (i || bayer) ? s->coded_height >> chroma_y_shift : s->coded_height; ptrdiff_t stride = (FFALIGN(width / 8, 8) + 64) * 8; + if ((ret = av_image_check_size2(stride, height, avctx->max_pixels, s->coded_format, 0, avctx)) < 0) + return ret; + if (chroma_y_shift && !bayer) height = FFALIGN(height / 8, 2) * 8; s->plane[i].width = width; commit 2bb6fa7c44588c25428aec81a423fec8a3e02fb9 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Tue Jul 15 23:28:09 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:15 2025 +0100 avcodec/ivi: Check luma/chroma mb_size Fixes: shift exponent -1 is negative Fixes: 429011224/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO5_fuzzer-5031059358285824 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit c0f1c3e18579c249cc729bc6033c034f6a6f7426) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index a5074e9980..30cfc5955e 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -991,9 +991,11 @@ static int decode_band(IVI45DecContext *ctx, for (t = 0; t < band->num_tiles; t++) { tile = &band->tiles[t]; - if (tile->mb_size != band->mb_size) { - av_log(avctx, AV_LOG_ERROR, "MB sizes mismatch: %d vs. %d\n", - band->mb_size, tile->mb_size); + if (tile->mb_size != band->mb_size || + ctx->planes[0].bands[0].mb_size < band->mb_size + ) { + av_log(avctx, AV_LOG_ERROR, "MB sizes mismatch: %d vs. %d vs. %d\n", + band->mb_size, tile->mb_size, ctx->planes[0].bands[0].mb_size); return AVERROR_INVALIDDATA; } tile->is_empty = get_bits1(&ctx->gb); commit 99bd8a74073603482d7bf64acd54617a908ae36f Author: James Almer <jamrial(a)gmail.com> AuthorDate: Sun Jul 13 20:01:26 2025 -0300 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:15 2025 +0100 avcodec/motion_est: don't add offsets to NULL pointers Fixes: libavcodec/motion_est.c:94:31: runtime error: applying zero offset to null pointer Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit 585a8d53576f19a14394d7728ed2831e1bee8dbf) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 26da3e3a2f..9b7d5e5aee 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -88,12 +88,12 @@ static inline void init_ref(MotionEstContext *c, uint8_t *src[3], uint8_t *ref[3 }; int i; for(i=0; i<3; i++){ - c->src[0][i]= src [i] + offset[i]; - c->ref[0][i]= ref [i] + offset[i]; + c->src[0][i]= src[i] ? FF_PTR_ADD(src[i], offset[i]) : NULL; + c->ref[0][i]= ref[i] ? FF_PTR_ADD(ref[i], offset[i]) : NULL; } if(ref_index){ for(i=0; i<3; i++){ - c->ref[ref_index][i]= ref2[i] + offset[i]; + c->ref[ref_index][i]= ref2[i] ? FF_PTR_ADD(ref2[i], offset[i]) : NULL; } } } commit 3f59e8d1fb8d7b9b6c878ddbb17ee21b64af196f Author: James Almer <jamrial(a)gmail.com> AuthorDate: Sun Jul 13 19:50:57 2025 -0300 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:14 2025 +0100 swscale/swscale_unscaled: don't add offsets to NULL pointers Fixes: libswscale/swscale_unscaled.c:916:20: runtime error: applying zero offset to null pointer Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit af9b43455a972841154b194057a79ee8b606e727) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index c4dd8a4d83..b405bcdff8 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -729,7 +729,7 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[], return srcSliceH; } - for(i=0; i<4; i++) { + for (i = 0; i < 4 && dst[i]; i++) { dst2013[i] += stride2013[i] * srcSliceY / 2; dst1023[i] += stride1023[i] * srcSliceY / 2; } commit 4d6a7843f1e95a6680a629c11f6187a5d36b1385 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Thu Jun 19 23:02:25 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:14 2025 +0100 avcodec/psd: Move frame allocation after RLE processing Fixes: Timeout Fixes: 410609448/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PSD_fuzzer-6267226128973824 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 67559760c6636b9c1643e4870bfe8c98244803d1) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/psd.c b/libavcodec/psd.c index ae7ad4e559..e421ac82f8 100644 --- a/libavcodec/psd.c +++ b/libavcodec/psd.c @@ -418,9 +418,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, s->uncompressed_size = s->line_size * s->height * s->channel_count; - if ((ret = ff_get_buffer(avctx, picture, 0)) < 0) - return ret; - /* decode picture if need */ if (s->compression == PSD_RLE) { s->tmp = av_malloc(s->uncompressed_size); @@ -443,6 +440,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, ptr_data = s->gb.buffer; } + if ((ret = ff_get_buffer(avctx, picture, 0)) < 0) + return ret; + /* Store data */ if ((avctx->pix_fmt == AV_PIX_FMT_YA8)||(avctx->pix_fmt == AV_PIX_FMT_YA16BE)){/* Interleaved */ ptr = picture->data[0]; commit 777f7e87bc1b80d0754be6cdae7d343045ba69b0 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Thu Jul 3 03:01:11 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:14 2025 +0100 avcodec/smacker: Move buffer allocation to later Reduces allocations on random input Fixes: 421650030/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMACKAUD_fuzzer-6144441767493632 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 9899c8c00bb7674fe3cf5c8483b522c6c78e1248) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 8db33c9275..a2e61b9603 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -639,10 +639,6 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, "The buffer does not contain an integer number of samples\n"); return AVERROR_INVALIDDATA; } - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) - return ret; - samples = (int16_t *)frame->data[0]; - samples8 = frame->data[0]; // Initialize for(i = 0; i < (1 << (bits + stereo)); i++) { @@ -664,6 +660,12 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, } else values[i] = h.entries[0].value; } + + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + samples = (int16_t *)frame->data[0]; + samples8 = frame->data[0]; + /* this codec relies on wraparound instead of clipping audio */ if(bits) { //decode 16-bit data for(i = stereo; i >= 0; i--) commit c6ea1492addb855ef77416492235d50097c3fb45 Author: Kacper Michajłow <kasper93(a)gmail.com> AuthorDate: Thu Jul 3 23:08:23 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:14 2025 +0100 avcodec/opus: don't materialize buf pointer from null Fixes: avcodec/opus/dec.c: runtime error: applying non-zero offset 10 to null pointer Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 3b6ec5abb5fb3cffdfcd25f834c43e53cab2cabe) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c index f0d7ed62a1..b2a8a16e4d 100644 --- a/libavcodec/opusdec.c +++ b/libavcodec/opusdec.c @@ -522,6 +522,9 @@ static int opus_decode_packet(AVCodecContext *avctx, void *data, s->decoded_samples = ret; decoded_samples = FFMIN(decoded_samples, ret); + if (!buf) + continue; + buf += s->packet.packet_size; buf_size -= s->packet.packet_size; } commit 40ef0b1ee1f38cbb7438ac84683a2094e14f2b09 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sat Jun 21 02:01:22 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:14 2025 +0100 avformat/iff: Check nb_channels == 0 in CHNL Fixes: division by 0 Fixes: 418396712/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-6104388018176000 Fixes: 418478219/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-4569544410857472 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Peter Ross <pross(a)xvid.org> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 5b1301004bdade13e3fee22081459e339ddd2637) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/iff.c b/libavformat/iff.c index 4a46b4b393..46a990aa0e 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -277,7 +277,7 @@ static int parse_dsd_prop(AVFormatContext *s, AVStream *st, uint64_t eof) if (size < 2) return AVERROR_INVALIDDATA; st->codecpar->channels = avio_rb16(pb); - if (size < 2 + st->codecpar->channels * 4) + if (size < 2 + st->codecpar->channels * 4 || !st->codecpar->channels ) return AVERROR_INVALIDDATA; st->codecpar->channel_layout = 0; if (st->codecpar->channels > FF_ARRAY_ELEMS(dsd_layout)) { commit 88a2c540579d6bfd6579346265eadc2797b43dd5 Author: James Almer <jamrial(a)gmail.com> AuthorDate: Sun Jun 22 10:51:06 2025 -0300 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:13 2025 +0100 avcodec/mss2dsp: use FF_PTR_ADD to add offsets to a pointer Fixes: libavcodec/mss2dsp.c:59:14: runtime error: applying zero offset to null pointer Tested-by: Kacper Michajlow <kasper93(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit b1172b8cc615a884d4051517d7356d5842939bb6) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/mss2dsp.c b/libavcodec/mss2dsp.c index cc39dd637f..ace92ef9c7 100644 --- a/libavcodec/mss2dsp.c +++ b/libavcodec/mss2dsp.c @@ -56,7 +56,7 @@ static av_always_inline void mss2_blit_wmv9_template(uint8_t *dst, } } } - mask += mask_stride; + mask = FF_PTR_ADD(mask, mask_stride); dst += dst_stride; srcy += srcy_stride; srcu += srcuv_stride * (r & 1); commit e3e479d077044175dca0376739eeafde49610573 Author: Marton Balint <cus(a)passwd.hu> AuthorDate: Sat Apr 10 11:59:00 2021 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:13 2025 +0100 avformat/hls: check return value of new_init_section() Fixes part of ticket #8931. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 28c83584e8f3cd747c1476a74cc2841d3d1fa7f3) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavformat/hls.c b/libavformat/hls.c index d22d06c5ae..fdec350a4d 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -895,6 +895,10 @@ static int parse_playlist(HLSContext *c, const char *url, ff_parse_key_value(ptr, (ff_parse_key_val_cb) handle_init_section_args, &info); cur_init_section = new_init_section(pls, &info, url); + if (!cur_init_section) { + ret = AVERROR(ENOMEM); + goto fail; + } cur_init_section->key_type = key_type; if (has_iv) { memcpy(cur_init_section->iv, iv, sizeof(iv)); commit 4ebd7e4a0888f404fa5f85ff8651d33390916c04 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Sun Sep 24 13:15:48 2023 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:13 2025 +0100 avcodec/rkmppdec: Fix double-free on error After having created the AVBuffer that is put into frame->buf[0], ownership of several objects (namely an AVDRMFrameDescriptor, an MppFrame and some AVBufferRefs framecontextref and decoder_ref) has passed to the AVBuffer and therefore to the frame. Yet it has nevertheless been freed manually on error afterwards, which would lead to a double-free as soon as the AVFrame is unreferenced. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> (cherry picked from commit 4513300989502090c4fd6560544dce399a8cd53c) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c index a60962dc86..19eff72387 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -460,8 +460,8 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame) frame->hw_frames_ctx = av_buffer_ref(decoder->frames_ref); if (!frame->hw_frames_ctx) { - ret = AVERROR(ENOMEM); - goto fail; + av_frame_unref(frame); + return AVERROR(ENOMEM); } return 0; commit 9e3bb8346c9811d4f9036dd123dd2dad2b58c5ec Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Wed Mar 13 02:10:26 2024 +0100 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Nov 30 21:38:13 2025 +0100 avcodec/ppc/vp8dsp_altivec: Fix out-of-bounds access h_subpel_filters_inner[i] and h_subpel_filters_outer[i / 2] belong together and the former allows the range 0..6, so the latter needs to support 0..3. But it has only three elements. Add another one. The value for the last element has been guesstimated from subpel_filters in libavcodec/vp8dsp.c. This is also intended to fix FATE-failures with UBSan here: https://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-1… Tested-by: Sean McGovern <gseanmcg(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> (cherry picked from commit 09e6840cf7a3ee07a73c3ae88a020bf27ca1a667) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c index 64ee703dc7..b8978cb041 100644 --- a/libavcodec/ppc/vp8dsp_altivec.c +++ b/libavcodec/ppc/vp8dsp_altivec.c @@ -49,11 +49,12 @@ static const vec_s8 h_subpel_filters_inner[7] = // for 6tap filters, these are the outer two taps // The zeros mask off pixels 4-7 when filtering 0-3 // and vice-versa -static const vec_s8 h_subpel_filters_outer[3] = +static const vec_s8 h_subpel_filters_outer[4] = { REPT4(0, 0, 2, 1), REPT4(0, 0, 3, 3), REPT4(0, 0, 1, 2), + REPT4(0, 0, 0, 0), }; #define LOAD_H_SUBPEL_FILTER(i) \ ----------------------------------------------------------------------- Summary of changes: Changelog | 80 +++++++++++++++++++++++++++++++++++++ RELEASE | 2 +- doc/Doxyfile | 2 +- doc/examples/avio_reading.c | 1 + doc/examples/decode_audio.c | 6 ++- fftools/ffmpeg_opt.c | 9 ++++- libavcodec/aacdec_template.c | 3 ++ libavcodec/aacenc_tns.c | 40 +++++++++++++------ libavcodec/aacsbr_template.c | 6 +++ libavcodec/cfhd.c | 3 ++ libavcodec/cri.c | 10 +++-- libavcodec/dxv.c | 6 ++- libavcodec/exr.c | 87 ++++++++++++++++++++++++++++++++++------- libavcodec/ffv1.c | 2 +- libavcodec/ffv1dec.c | 9 ++++- libavcodec/fits.c | 2 + libavcodec/g723_1.h | 2 +- libavcodec/g723_1enc.c | 2 +- libavcodec/g726.c | 2 + libavcodec/ilbcdec.c | 2 + libavcodec/imc.c | 2 + libavcodec/ivi.c | 8 ++-- libavcodec/jpeg2000dec.c | 24 +++++++++++- libavcodec/lzf.c | 5 ++- libavcodec/mjpegdec.c | 2 + libavcodec/motion_est.c | 6 +-- libavcodec/mpc8.c | 8 +++- libavcodec/mss2dsp.c | 2 +- libavcodec/opusdec.c | 3 ++ libavcodec/ppc/vp8dsp_altivec.c | 3 +- libavcodec/psd.c | 6 +-- libavcodec/rkmppdec.c | 4 +- libavcodec/sanm.c | 5 +++ libavcodec/scpr3.c | 2 +- libavcodec/smacker.c | 10 +++-- libavcodec/tests/avpacket.c | 4 ++ libavcodec/tests/motion.c | 4 ++ libavcodec/tests/snowenc.c | 7 +++- libavcodec/utvideodec.c | 6 +-- libavcodec/vqavideo.c | 10 +++-- libavfilter/avf_showcqt.c | 4 +- libavformat/asfdec_f.c | 6 ++- libavformat/avidec.c | 2 +- libavformat/aviobuf.c | 2 +- libavformat/concatdec.c | 2 +- libavformat/dashdec.c | 13 +++++- libavformat/hls.c | 8 +++- libavformat/http.c | 2 +- libavformat/iff.c | 2 +- libavformat/lrcdec.c | 18 +++++---- libavformat/mov.c | 4 +- libavformat/mxg.c | 2 + libavformat/rtmpproto.c | 26 +++++++++++- libavformat/rtpdec_rfc4175.c | 28 +++++++++---- libavformat/rtpenc_h264_hevc.c | 3 ++ libavformat/sctp.c | 3 ++ libavutil/common.h | 8 ++-- libswscale/output.c | 4 +- libswscale/swscale_unscaled.c | 2 +- 59 files changed, 427 insertions(+), 109 deletions(-) hooks/post-receive --

1 0