June 2024 - ffmpeg-cvslog - lists.ffmpeg.org

lavc/vc1dsp: fix potential overflow in R-V V inv_trans_4
by Rémi Denis-Courmont 30 Jun '24

30 Jun '24

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Thu Jun 27 22:00:05 2024 +0300| [b818dff8d8e16f0831a379a5cdc15e813474a841] | committer: Rémi Denis-Courmont lavc/vc1dsp: fix potential overflow in R-V V inv_trans_4 Judging by the coefficients, the last round of add/sub can overflow to 17 bits with a very small probability just as with the 8-point transform. This is not observed under FATE, but better safe than sorry. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b818dff8d8e16f083… --- libavcodec/riscv/vc1dsp_rvv.S | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/riscv/vc1dsp_rvv.S b/libavcodec/riscv/vc1dsp_rvv.S index 0e89e29a1d..9d85377cec 100644 --- a/libavcodec/riscv/vc1dsp_rvv.S +++ b/libavcodec/riscv/vc1dsp_rvv.S @@ -202,13 +202,14 @@ func ff_vc1_inv_trans_4_rvv, zve32x vmul.vx v20, v1, t2 vadd.vv v26, v14, v16 # t3 vsub.vv v27, v18, v20 # t4 - vadd.vv v0, v24, v26 - vsub.vv v1, v25, v27 - vadd.vv v2, v25, v27 - vsub.vv v3, v24, v26 - .irp n,0,1,2,3 - vssra.vx v\n, v\n, t1 # + 4 >> 3 or + 64 >> 7 - .endr + vwadd.vv v8, v24, v26 + vwsub.vv v10, v25, v27 + vwadd.vv v12, v25, v27 + vwsub.vv v14, v24, v26 + vnclip.wx v0, v8, t1 + vnclip.wx v1, v10, t1 + vnclip.wx v2, v12, t1 + vnclip.wx v3, v14, t1 jr t0 endfunc

1 0

lavc/vc1dsp: fix overflow in R-V V inv_trans_8
by Rémi Denis-Courmont 30 Jun '24

30 Jun '24

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Thu Jun 27 21:21:29 2024 +0300| [349c49fd1bc5ae2d81ea8d93e0b31823fe8b2c59] | committer: Rémi Denis-Courmont lavc/vc1dsp: fix overflow in R-V V inv_trans_8 The last set of additions/subtractions can break the 16-bit limit, and require 17 bits of precision. This uses widening adds accordingly to fix the MSS2 FATE tests. The problem potentially also affects inv_trans_4 with a very low probability, but this is not reproducible under FATE. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=349c49fd1bc5ae2d8… --- libavcodec/riscv/vc1dsp_rvv.S | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/libavcodec/riscv/vc1dsp_rvv.S b/libavcodec/riscv/vc1dsp_rvv.S index 068374d3c9..0e89e29a1d 100644 --- a/libavcodec/riscv/vc1dsp_rvv.S +++ b/libavcodec/riscv/vc1dsp_rvv.S @@ -141,44 +141,49 @@ func ff_vc1_inv_trans_8_rvv, zve32x vadd.vv v20, v20, v21 vadd.vv v22, v22, v23 vsll.vi v21, v3, 2 - vadd.vv v16, v20, v22 # t1 + vadd.vv v24, v20, v22 # t1 vmul.vx v20, v1, t5 vsll.vi v22, v5, 4 vmul.vx v23, v7, t3 vsub.vv v20, v20, v21 vadd.vv v22, v22, v23 vsll.vi v21, v3, 4 - vsub.vv v17, v20, v22 # t2 + vsub.vv v25, v20, v22 # t2 vmul.vx v20, v1, t3 vsll.vi v22, v5, 2 vmul.vx v23, v7, t5 vsub.vv v20, v20, v21 vadd.vv v22, v22, v23 vmul.vx v21, v3, t3 - vadd.vv v18, v20, v22 # t3 + vadd.vv v26, v20, v22 # t3 vsll.vi v20, v1, 2 vmul.vx v22, v5, t5 vsll.vi v23, v7, 4 vsub.vv v20, v20, v21 vsub.vv v22, v22, v23 + vadd.vv v27, v20, v22 # t4 srli t2, t1, 2 - vadd.vv v0, v28, v16 - vadd.vv v19, v20, v22 # t4 - vadd.vv v1, v29, v17 - vadd.vv v2, v30, v18 - vadd.vv v3, v31, v19 - vsub.vv v4, v31, v19 - vsub.vv v5, v30, v18 - vsub.vv v6, v29, v17 - vsub.vv v7, v28, v16 + vwadd.vv v8, v28, v24 + vwadd.vv v10, v29, v25 + vwadd.vv v12, v30, v26 + vwadd.vv v14, v31, v27 beqz t2, 1f # faster than 4x add t2=zero - .irp n,4,5,6,7 + .irp n,31,30,29,28 vadd.vi v\n, v\n, 1 .endr 1: - .irp n,0,1,2,3,4,5,6,7 - vssra.vx v\n, v\n, t1 - .endr + vwsub.vv v16, v31, v27 + vwsub.vv v18, v30, v26 + vwsub.vv v20, v29, v25 + vwsub.vv v22, v28, v24 + vnclip.wx v0, v8, t1 + vnclip.wx v1, v10, t1 + vnclip.wx v2, v12, t1 + vnclip.wx v3, v14, t1 + vnclip.wx v4, v16, t1 + vnclip.wx v5, v18, t1 + vnclip.wx v6, v20, t1 + vnclip.wx v7, v22, t1 jr t0 endfunc

1 0

lavc/vc1dsp: factor R-V V inv_trans_8 code
by Rémi Denis-Courmont 30 Jun '24

30 Jun '24

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Tue Jun 11 17:48:00 2024 +0300| [2c900d4c11199561673cbffadeebb5cff62a7d8c] | committer: Rémi Denis-Courmont lavc/vc1dsp: factor R-V V inv_trans_8 code > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c900d4c111995616… --- libavcodec/riscv/vc1dsp_rvv.S | 65 +++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 42 deletions(-) diff --git a/libavcodec/riscv/vc1dsp_rvv.S b/libavcodec/riscv/vc1dsp_rvv.S index 860b0cc5b1..068374d3c9 100644 --- a/libavcodec/riscv/vc1dsp_rvv.S +++ b/libavcodec/riscv/vc1dsp_rvv.S @@ -161,6 +161,7 @@ func ff_vc1_inv_trans_8_rvv, zve32x vsll.vi v23, v7, 4 vsub.vv v20, v20, v21 vsub.vv v22, v22, v23 + srli t2, t1, 2 vadd.vv v0, v28, v16 vadd.vv v19, v20, v22 # t4 vadd.vv v1, v29, v17 @@ -170,6 +171,14 @@ func ff_vc1_inv_trans_8_rvv, zve32x vsub.vv v5, v30, v18 vsub.vv v6, v29, v17 vsub.vv v7, v28, v16 + beqz t2, 1f # faster than 4x add t2=zero + .irp n,4,5,6,7 + vadd.vi v\n, v\n, 1 + .endr +1: + .irp n,0,1,2,3,4,5,6,7 + vssra.vx v\n, v\n, t1 + .endr jr t0 endfunc @@ -216,35 +225,22 @@ func ff_vc1_inv_trans_8x8_rvv, zve32x addi a7, a0, 7 * 8 * 2 vle16.v v6, (a6) vle16.v v7, (a7) + li t1, 3 jal t0, ff_vc1_inv_trans_8_rvv - .irp n,0,1,2,3,4,5,6,7 - vssra.vi v\n, v\n, 3 - .endr vsseg8e16.v v0, (a0) .irp n,0,1,2,3,4,5,6,7 vle16.v v\n, (a\n) .endr + li t1, 7 jal t0, ff_vc1_inv_trans_8_rvv - vadd.vi v4, v4, 1 - vadd.vi v5, v5, 1 - vssra.vi v4, v4, 7 - vssra.vi v5, v5, 7 - vse16.v v4, (a4) - vadd.vi v6, v6, 1 - vse16.v v5, (a5) - vadd.vi v7, v7, 1 - vssra.vi v6, v6, 7 - vssra.vi v7, v7, 7 - vse16.v v6, (a6) - vssra.vi v0, v0, 7 - vse16.v v7, (a7) - vssra.vi v1, v1, 7 vse16.v v0, (a0) - vssra.vi v2, v2, 7 vse16.v v1, (a1) - vssra.vi v3, v3, 7 vse16.v v2, (a2) vse16.v v3, (a3) + vse16.v v4, (a4) + vse16.v v5, (a5) + vse16.v v6, (a6) + vse16.v v7, (a7) ret endfunc @@ -252,6 +248,7 @@ func ff_vc1_inv_trans_8x4_rvv, zve32x csrwi vxrm, 0 vsetivli zero, 4, e16, mf2, ta, ma vlseg8e16.v v0, (a2) + li t1, 3 jal t0, ff_vc1_inv_trans_8_rvv vsseg8e16.v v0, (a2) addi a3, a2, 1 * 8 * 2 @@ -262,10 +259,6 @@ func ff_vc1_inv_trans_8x4_rvv, zve32x addi a5, a2, 3 * 8 * 2 vle16.v v2, (a4) vle16.v v3, (a5) - .irp n,0,1,2,3 - # shift 4 vectors of 8 elems after transpose instead of 8 of 4 - vssra.vi v\n, v\n, 3 - .endr li t1, 7 jal t0, ff_vc1_inv_trans_4_rvv add a3, a1, a0 @@ -320,33 +313,21 @@ func ff_vc1_inv_trans_4x8_rvv, zve32x addi t1, a2, 7 * 8 * 2 vle16.v v6, (t6) vle16.v v7, (t1) - + li t1, 7 jal t0, ff_vc1_inv_trans_8_rvv - vadd.vi v4, v4, 1 add t0, a1, a0 - vadd.vi v5, v5, 1 - vadd.vi v6, v6, 1 - add t1, a1, t0 - vadd.vi v7, v7, 1 - vssra.vi v0, v0, 7 - add t2, a1, t1 - vssra.vi v1, v1, 7 - vssra.vi v2, v2, 7 - add t3, a1, t2 - vssra.vi v3, v3, 7 - vssra.vi v4, v4, 7 - add t4, a1, t3 - vssra.vi v5, v5, 7 - vssra.vi v6, v6, 7 - add t5, a1, t4 - vssra.vi v7, v7, 7 vle8.v v8, (a0) - add t6, a1, t5 + add t1, a1, t0 vle8.v v9, (t0) + add t2, a1, t1 vle8.v v10, (t1) + add t3, a1, t2 vle8.v v11, (t2) + add t4, a1, t3 vle8.v v12, (t3) + add t5, a1, t4 vle8.v v13, (t4) + add t6, a1, t5 vle8.v v14, (t5) vle8.v v15, (t6) vsetvli zero, zero, e8, mf4, ta, ma

1 0

avcodec/iirfilter: Move ff_iir_filter() to lavc/tests/iirfilter.c
by Andreas Rheinhardt 30 Jun '24

30 Jun '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Jun 16 14:06:28 2024 +0200| [2902ed25b58cb31ec3e0c2ef7d4740ae18200d2d] | committer: Andreas Rheinhardt avcodec/iirfilter: Move ff_iir_filter() to lavc/tests/iirfilter.c It is only used by the test. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2902ed25b58cb31ec… --- libavcodec/iirfilter.c | 14 -------------- libavcodec/iirfilter.h | 15 --------------- libavcodec/tests/iirfilter.c | 17 ++++++++++++++++- 3 files changed, 16 insertions(+), 30 deletions(-) diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c index 727a370444..cefe35ab6e 100644 --- a/libavcodec/iirfilter.c +++ b/libavcodec/iirfilter.c @@ -277,20 +277,6 @@ av_cold struct FFIIRFilterState *ff_iir_filter_init_state(int order) } \ } -void ff_iir_filter(const struct FFIIRFilterCoeffs *c, - struct FFIIRFilterState *s, int size, - const int16_t *src, ptrdiff_t sstep, - int16_t *dst, ptrdiff_t dstep) -{ - if (c->order == 2) { - FILTER_O2(int16_t, S16) - } else if (c->order == 4) { - FILTER_BW_O4(int16_t, S16) - } else { - FILTER_DIRECT_FORM_II(int16_t, S16) - } -} - /** * Perform IIR filtering on floating-point input samples. * diff --git a/libavcodec/iirfilter.h b/libavcodec/iirfilter.h index d6b8fe2782..8ab8ae68c6 100644 --- a/libavcodec/iirfilter.h +++ b/libavcodec/iirfilter.h @@ -28,7 +28,6 @@ #define AVCODEC_IIRFILTER_H #include <stddef.h> -#include <stdint.h> struct FFIIRFilterCoeffs; struct FFIIRFilterState; @@ -114,18 +113,4 @@ void ff_iir_filter_free_coeffsp(struct FFIIRFilterCoeffs **coeffs); */ void ff_iir_filter_free_statep(struct FFIIRFilterState **state); -/** - * Perform IIR filtering on signed 16-bit input samples. - * - * @param coeffs pointer to filter coefficients - * @param state pointer to filter state - * @param size input length - * @param src source samples - * @param sstep source stride - * @param dst filtered samples (destination may be the same as input) - * @param dstep destination stride - */ -void ff_iir_filter(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterState *state, - int size, const int16_t *src, ptrdiff_t sstep, int16_t *dst, ptrdiff_t dstep); - #endif /* AVCODEC_IIRFILTER_H */ diff --git a/libavcodec/tests/iirfilter.c b/libavcodec/tests/iirfilter.c index 60cc6fc43d..e03e842b85 100644 --- a/libavcodec/tests/iirfilter.c +++ b/libavcodec/tests/iirfilter.c @@ -23,10 +23,25 @@ #include "libavutil/libm.h" #include "libavcodec/iirfilter.h" +#include "libavcodec/iirfilter.c" #define FILT_ORDER 4 #define SIZE 1024 +static void iir_filter_int16(const struct FFIIRFilterCoeffs *c, + struct FFIIRFilterState *s, int size, + const int16_t *src, ptrdiff_t sstep, + int16_t *dst, ptrdiff_t dstep) +{ + if (c->order == 2) { + FILTER_O2(int16_t, S16) + } else if (c->order == 4) { + FILTER_BW_O4(int16_t, S16) + } else { + FILTER_DIRECT_FORM_II(int16_t, S16) + } +} + int main(void) { struct FFIIRFilterCoeffs *fcoeffs = NULL; @@ -43,7 +58,7 @@ int main(void) for (i = 0; i < SIZE; i++) x[i] = lrint(0.75 * INT16_MAX * sin(0.5 * M_PI * i * i / SIZE)); - ff_iir_filter(fcoeffs, fstate, SIZE, x, 1, y, 1); + iir_filter_int16(fcoeffs, fstate, SIZE, x, 1, y, 1); for (i = 0; i < SIZE; i++) printf("%6d %6d\n", x[i], y[i]);

1 0

avfilter/textutils: Constify ff_expand_text()
by Andreas Rheinhardt 30 Jun '24

30 Jun '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Jun 20 21:01:34 2024 +0200| [2330e77c976f4b41ae3ad5526138b3479f595819] | committer: Andreas Rheinhardt avfilter/textutils: Constify ff_expand_text() Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2330e77c976f4b41a… --- libavfilter/textutils.c | 6 +++--- libavfilter/textutils.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/textutils.c b/libavfilter/textutils.c index 0b132fd153..e6b5239b20 100644 --- a/libavfilter/textutils.c +++ b/libavfilter/textutils.c @@ -79,7 +79,7 @@ static int ff_expand_text_function_internal(FFExpandTextContext *expand_text, AV * @return negative value corresponding to an AVERROR error code in case of * errors, a non-negative value otherwise */ -static int ff_expand_text_function(FFExpandTextContext *expand_text, AVBPrint *bp, char **rtext) +static int ff_expand_text_function(FFExpandTextContext *expand_text, AVBPrint *bp, const char **rtext) { void *log_ctx = expand_text->log_ctx; const char *text = *rtext; @@ -112,7 +112,7 @@ static int ff_expand_text_function(FFExpandTextContext *expand_text, AVBPrint *b if ((ret = ff_expand_text_function_internal(expand_text, bp, argv[0], argc - 1, argv + 1)) < 0) goto end; ret = 0; - *rtext = (char *)text + 1; + *rtext = text + 1; end: for (i = 0; i < argc; i++) @@ -120,7 +120,7 @@ end: return ret; } -int ff_expand_text(FFExpandTextContext *expand_text, char *text, AVBPrint *bp) +int ff_expand_text(FFExpandTextContext *expand_text, const char *text, AVBPrint *bp) { int ret; diff --git a/libavfilter/textutils.h b/libavfilter/textutils.h index d89956bfcc..8c2399d153 100644 --- a/libavfilter/textutils.h +++ b/libavfilter/textutils.h @@ -94,7 +94,7 @@ typedef struct FFExpandTextContext { * @return negative value corresponding to an AVERROR error code in case of * errors, a non-negative value otherwise */ -int ff_expand_text(FFExpandTextContext *expand_text, char *text, AVBPrint *bp); +int ff_expand_text(FFExpandTextContext *expand_text, const char *text, AVBPrint *bp); /** * Print PTS representation to an AVBPrint object.

1 0

avfilter/textutils,vf_drawtext,qrencode: Constify function pointers
by Andreas Rheinhardt 30 Jun '24

30 Jun '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Jun 20 19:11:58 2024 +0200| [ba457e9adbd8188d48f8a91384461f498e0d10d6] | committer: Andreas Rheinhardt avfilter/textutils,vf_drawtext,qrencode: Constify function pointers Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba457e9adbd8188d4… --- libavfilter/qrencode.c | 2 +- libavfilter/textutils.c | 2 +- libavfilter/textutils.h | 2 +- libavfilter/vf_drawtext.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/qrencode.c b/libavfilter/qrencode.c index 0b1f7bb50a..1c7ce23e6e 100644 --- a/libavfilter/qrencode.c +++ b/libavfilter/qrencode.c @@ -284,7 +284,7 @@ static int func_eval_expr_formatted(void *ctx, AVBPrint *bp, const char *functio argv[1][0], positions); } -static FFExpandTextFunction expand_text_functions[] = { +static const FFExpandTextFunction expand_text_functions[] = { { "expr", 1, 1, func_eval_expr }, { "e", 1, 1, func_eval_expr }, { "expr_formatted", 2, 3, func_eval_expr_formatted }, diff --git a/libavfilter/textutils.c b/libavfilter/textutils.c index 45967794bc..0b132fd153 100644 --- a/libavfilter/textutils.c +++ b/libavfilter/textutils.c @@ -36,7 +36,7 @@ static int ff_expand_text_function_internal(FFExpandTextContext *expand_text, AV char *name, unsigned argc, char **argv) { void *log_ctx = expand_text->log_ctx; - FFExpandTextFunction *functions = expand_text->functions; + const FFExpandTextFunction *functions = expand_text->functions; unsigned i; for (i = 0; i < expand_text->functions_nb; i++) { diff --git a/libavfilter/textutils.h b/libavfilter/textutils.h index 7fa856c681..d89956bfcc 100644 --- a/libavfilter/textutils.h +++ b/libavfilter/textutils.h @@ -74,7 +74,7 @@ typedef struct FFExpandTextContext { * list of functions to use to expand sequences in the format * FUNCTION_NAME{PARAMS} */ - FFExpandTextFunction *functions; + const FFExpandTextFunction *functions; /** * number of functions diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 2b6a0d0839..0ac0a0721c 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -950,7 +950,7 @@ static int func_eval_expr_int_format(void *ctx, AVBPrint *bp, const char *functi argv[1][0], positions); } -static FFExpandTextFunction expand_text_functions[] = { +static const FFExpandTextFunction expand_text_functions[] = { { "e", 1, 1, func_eval_expr }, { "eif", 2, 3, func_eval_expr_int_format }, { "expr", 1, 1, func_eval_expr },

1 0

avcodec/mpeg12dec: Don't adapt (last|next)_pic.linesize for field pics
by Andreas Rheinhardt 30 Jun '24

30 Jun '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Jun 24 01:38:17 2024 +0200| [5a30b45c0fe4abaaf69ca8e465bf8113fee23626] | committer: Andreas Rheinhardt avcodec/mpeg12dec: Don't adapt (last|next)_pic.linesize for field pics These values are not read anywhere. Furthermore, since commit fe6037fd04db8837dcdb9013f9c4ad4e7eb0592e the linesize values of the MPVWorkPictures were wrong for subsequent fields in a chain of B-pictures (as they are always doubled and no longer based upon the frame-linesizes) which can eventually lead to overflow. Finally, it makes no real sense to ever double the linesize of the reference pictures at all: Even when the current picture is a field, it can still reference both fields of reference pictures and therefore the linesize should allow to address both fields (for the same reason, data is not offset for reference pictures). libavcodec/mpeg12dec.c:1304:41: runtime error: signed integer overflow: 4611686018427387904 * 2 cannot be represented in type 'long' issue: 69732/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEGVIDEO_fuzzer-5123551179374592 Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a30b45c0fe4abaaf… --- libavcodec/mpeg12dec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 09befdcc64..bb0a769e49 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1278,8 +1278,6 @@ static int mpeg_field_start(Mpeg1Context *s1, const uint8_t *buf, int buf_size) s->cur_pic.linesize[i]); } s->cur_pic.linesize[i] *= 2; - s->last_pic.linesize[i] *= 2; - s->next_pic.linesize[i] *= 2; } }

1 0

avcodec/aacsbr_template: Remove unused-but-set variable
by Andreas Rheinhardt 30 Jun '24

30 Jun '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Jun 23 20:25:15 2024 +0200| [f26255962c1dd516c6fc0a25e460ad538fa21ff6] | committer: Andreas Rheinhardt avcodec/aacsbr_template: Remove unused-but-set variable Also fixes a -Wdeclaration-after-statement. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f26255962c1dd516c… --- libavcodec/aacsbr_template.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index e5bc4d4659..436b549fe7 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -1268,8 +1268,6 @@ int ff_aac_sbr_decode_usac_data(AACDecContext *ac, ChannelElement *che, sbr->ready_for_dequant = 1; - int start = get_bits_count(gb); - if (sbr_ch == 1) { /* sbr_single_channel_element */ /* if (harmonicSBR) ... */

1 0

avutil/timestamp: avoid possible FPE when 0 is passed to av_ts_make_time_string2()
by Marton Balint 30 Jun '24

30 Jun '24

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Mon Jun 17 22:30:26 2024 +0200| [0d5e3f5a4034b6c9312b7c621e25aa4303a00b6f] | committer: Marton Balint avutil/timestamp: avoid possible FPE when 0 is passed to av_ts_make_time_string2() Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d5e3f5a4034b6c93… --- libavutil/timestamp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/timestamp.c b/libavutil/timestamp.c index 2a3e3012a4..6c231a517d 100644 --- a/libavutil/timestamp.c +++ b/libavutil/timestamp.c @@ -24,7 +24,7 @@ char *av_ts_make_time_string2(char *buf, int64_t ts, AVRational tb) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS"); } else { double val = av_q2d(tb) * ts; - double log = floor(log10(fabs(val))); + double log = (fpclassify(val) == FP_ZERO ? -INFINITY : floor(log10(fabs(val)))); int precision = (isfinite(log) && log < 0) ? -log + 5 : 6; int last = snprintf(buf, AV_TS_MAX_STRING_SIZE, "%.*f", precision, val); last = FFMIN(last, AV_TS_MAX_STRING_SIZE - 1) - 1;

1 0

lavu/lls: remove useless VSETVL
by Rémi Denis-Courmont 29 Jun '24

29 Jun '24

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Wed Jun 26 21:44:23 2024 +0300| [d5e603ddc07211d3c2376d592ec161113c55e036] | committer: Rémi Denis-Courmont lavu/lls: remove useless VSETVL This changes neither VL nor VTYPE, so it can safely be removed. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5e603ddc07211d3c… --- libavutil/riscv/lls_rvv.S | 1 - 1 file changed, 1 deletion(-) diff --git a/libavutil/riscv/lls_rvv.S b/libavutil/riscv/lls_rvv.S index e0e6f1008e..a36055bd7a 100644 --- a/libavutil/riscv/lls_rvv.S +++ b/libavutil/riscv/lls_rvv.S @@ -26,7 +26,6 @@ func ff_lls_update_covariance_rvv, zve64d, zbb vle64.v v8, (a1) 1: vfmv.f.s ft0, v8 - vsetvl zero, a2, t0 vle64.v v16, (a0) vfmacc.vf v16, ft0, v8 addi a2, a2, -1

1 0