May 2024 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/af_afir: Merge header into af_afir.c
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri May 24 10:12:12 2024 +0200| [2d818644a3f1e189036107afc96c8187538d71a8] | committer: Andreas Rheinhardt avfilter/af_afir: Merge header into af_afir.c Done in 0df18f29ae218f30b3ecff7c930176b8ebee56aa, accidentally undone in 163e737c1793eeea9c2df15298253ffc04906afe. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d818644a3f1e1890… --- libavfilter/af_afir.c | 81 ++++++++++++++++++++++++++++++++++++- libavfilter/af_afir.h | 110 -------------------------------------------------- 2 files changed, 80 insertions(+), 111 deletions(-) diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index 8997fbd7c9..24f8f8cbf1 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -34,15 +34,94 @@ #include "libavutil/frame.h" #include "libavutil/log.h" #include "libavutil/opt.h" +#include "libavutil/rational.h" #include "audio.h" #include "avfilter.h" #include "filters.h" #include "formats.h" #include "internal.h" -#include "af_afir.h" #include "af_afirdsp.h" +#define MAX_IR_STREAMS 32 + +typedef struct AudioFIRSegment { + int nb_partitions; + int part_size; + int block_size; + int fft_length; + int coeff_size; + int input_size; + int input_offset; + + int *output_offset; + int *part_index; + + AVFrame *sumin; + AVFrame *sumout; + AVFrame *blockout; + AVFrame *tempin; + AVFrame *tempout; + AVFrame *buffer; + AVFrame *coeff; + AVFrame *input; + AVFrame *output; + + AVTXContext **ctx, **tx, **itx; + av_tx_fn ctx_fn, tx_fn, itx_fn; +} AudioFIRSegment; + +typedef struct AudioFIRContext { + const AVClass *class; + + float wet_gain; + float dry_gain; + float length; + int gtype; + float ir_norm; + float ir_link; + float ir_gain; + int ir_format; + int ir_load; + float max_ir_len; + int response; + int w, h; + AVRational frame_rate; + int ir_channel; + int minp; + int maxp; + int nb_irs; + int prev_selir; + int selir; + int precision; + int format; + + int eof_coeffs[MAX_IR_STREAMS]; + int have_coeffs[MAX_IR_STREAMS]; + int nb_taps[MAX_IR_STREAMS]; + int nb_segments[MAX_IR_STREAMS]; + int max_offset[MAX_IR_STREAMS]; + int nb_channels; + int one2many; + int prev_is_disabled; + int *loading; + double *ch_gain; + + AudioFIRSegment seg[MAX_IR_STREAMS][1024]; + + AVFrame *in; + AVFrame *xfade[2]; + AVFrame *fadein[2]; + AVFrame *ir[MAX_IR_STREAMS]; + AVFrame *norm_ir[MAX_IR_STREAMS]; + int min_part_size; + int max_part_size; + int64_t pts; + + AudioFIRDSPContext afirdsp; + AVFloatDSPContext *fdsp; +} AudioFIRContext; + #define DEPTH 32 #include "afir_template.c" diff --git a/libavfilter/af_afir.h b/libavfilter/af_afir.h deleted file mode 100644 index 8e4afd79c9..0000000000 --- a/libavfilter/af_afir.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2017 Paul B Mahol - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVFILTER_AFIR_H -#define AVFILTER_AFIR_H - -#include "libavutil/float_dsp.h" -#include "libavutil/frame.h" -#include "libavutil/rational.h" -#include "libavutil/tx.h" -#include "avfilter.h" -#include "af_afirdsp.h" - -#define MAX_IR_STREAMS 32 - -typedef struct AudioFIRSegment { - int nb_partitions; - int part_size; - int block_size; - int fft_length; - int coeff_size; - int input_size; - int input_offset; - - int *output_offset; - int *part_index; - - AVFrame *sumin; - AVFrame *sumout; - AVFrame *blockout; - AVFrame *tempin; - AVFrame *tempout; - AVFrame *buffer; - AVFrame *coeff; - AVFrame *input; - AVFrame *output; - - AVTXContext **ctx, **tx, **itx; - av_tx_fn ctx_fn, tx_fn, itx_fn; -} AudioFIRSegment; - -typedef struct AudioFIRContext { - const AVClass *class; - - float wet_gain; - float dry_gain; - float length; - int gtype; - float ir_norm; - float ir_link; - float ir_gain; - int ir_format; - int ir_load; - float max_ir_len; - int response; - int w, h; - AVRational frame_rate; - int ir_channel; - int minp; - int maxp; - int nb_irs; - int prev_selir; - int selir; - int precision; - int format; - - int eof_coeffs[MAX_IR_STREAMS]; - int have_coeffs[MAX_IR_STREAMS]; - int nb_taps[MAX_IR_STREAMS]; - int nb_segments[MAX_IR_STREAMS]; - int max_offset[MAX_IR_STREAMS]; - int nb_channels; - int one2many; - int prev_is_disabled; - int *loading; - double *ch_gain; - - AudioFIRSegment seg[MAX_IR_STREAMS][1024]; - - AVFrame *in; - AVFrame *xfade[2]; - AVFrame *fadein[2]; - AVFrame *ir[MAX_IR_STREAMS]; - AVFrame *norm_ir[MAX_IR_STREAMS]; - int min_part_size; - int max_part_size; - int64_t pts; - - AudioFIRDSPContext afirdsp; - AVFloatDSPContext *fdsp; -} AudioFIRContext; - -#endif /* AVFILTER_AFIR_H */

1 0

avfilter/af_aiir: Avoid unchecked allocation
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri May 24 09:48:12 2024 +0200| [21bfc62642cb16fc3d867999db341d3c67e03404] | committer: Andreas Rheinhardt avfilter/af_aiir: Avoid unchecked allocation W has not been checked at all; allocate it jointly with M to fix this. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21bfc62642cb16fc3… --- libavfilter/af_aiir.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index 324fc367a3..7bd9e37e43 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -828,17 +828,17 @@ static int convert_serial2parallel(AVFilterContext *ctx, int channels) double *impulse = av_calloc(length, sizeof(*impulse)); double *y = av_calloc(length, sizeof(*y)); double *resp = av_calloc(length, sizeof(*resp)); - double *M = av_calloc((length - 1) * 2 * nb_biquads, sizeof(*M)); - double *W = av_calloc((length - 1) * 2 * nb_biquads, sizeof(*W)); + double *M = av_calloc((length - 1) * nb_biquads, 2 * 2 * sizeof(*M)); + double *W; if (!impulse || !y || !resp || !M) { av_free(impulse); av_free(y); av_free(resp); av_free(M); - av_free(W); return AVERROR(ENOMEM); } + W = M + (length - 1) * 2 * nb_biquads; impulse[0] = 1.; @@ -877,7 +877,6 @@ static int convert_serial2parallel(AVFilterContext *ctx, int channels) av_free(y); av_free(resp); av_free(M); - av_free(W); } return 0;

1 0

avfilter/af_aiir: Remove dead code
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri May 24 09:37:41 2024 +0200| [37cc648fbd9e6d3dc61e8ac487774d330131c70f] | committer: Andreas Rheinhardt avfilter/af_aiir: Remove dead code Fixes Coverity issue #1468252. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37cc648fbd9e6d3dc… --- libavfilter/af_aiir.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index b5e5b41db6..324fc367a3 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -820,7 +820,6 @@ static void solve(double *matrix, double *vector, int n, double *y, double *x, d static int convert_serial2parallel(AVFilterContext *ctx, int channels) { AudioIIRContext *s = ctx->priv; - int ret = 0; for (int ch = 0; ch < channels; ch++) { IIRChannel *iir = &s->iir[ch]; @@ -879,9 +878,6 @@ static int convert_serial2parallel(AVFilterContext *ctx, int channels) av_free(resp); av_free(M); av_free(W); - - if (ret < 0) - return ret; } return 0;

1 0

avformat/matroskadec: Add assert to silence Coverity false positive
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri May 24 09:29:24 2024 +0200| [996e0a57cad35d6ec5c6eef845628e7c8be240e0] | committer: Andreas Rheinhardt avformat/matroskadec: Add assert to silence Coverity false positive Helps with Coverity issue #1452453. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=996e0a57cad35d6ec… --- libavformat/matroskadec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 2f07e11d87..13959f8b3d 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1315,6 +1315,8 @@ static int ebml_parse(MatroskaDemuxContext *matroska, matroska->num_levels--; return LEVEL_ENDED; } + // We have not encountered a known element; syntax is a sentinel. + av_assert1(syntax->type == EBML_NONE); }; }

1 0

avfilter/vf_signalstats: Use 64bit for processing histogram
by Andreas Rheinhardt 31 May '24

31 May '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri May 24 08:54:40 2024 +0200| [dfd0320e23e39ce1362fcb1f919d3f6d6c8a0b53] | committer: Andreas Rheinhardt avfilter/vf_signalstats: Use 64bit for processing histogram The result might not fit into 32bit if an image has gigantic dimensions and one of the planes has a dominant value (particularly so if said value is big). Fixes Coverity issues #1598399, #1598401, #1598402, #1598403, #1598404. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfd0320e23e39ce13… --- libavfilter/vf_signalstats.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c index 50c9df4298..78a23bb705 100644 --- a/libavfilter/vf_signalstats.c +++ b/libavfilter/vf_signalstats.c @@ -721,10 +721,10 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) if (histv[fil]) maxv = fil; if (histsat[fil]) maxsat = fil; - toty += histy[fil] * fil; - totu += histu[fil] * fil; - totv += histv[fil] * fil; - totsat += histsat[fil] * fil; + toty += (uint64_t)histy[fil] * fil; + totu += (uint64_t)histu[fil] * fil; + totv += (uint64_t)histv[fil] * fil; + totsat += (uint64_t)histsat[fil] * fil; accy += histy[fil]; accu += histu[fil]; @@ -745,7 +745,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) maxhue = histhue[0]; medhue = -1; for (fil = 0; fil < 360; fil++) { - tothue += histhue[fil] * fil; + tothue += (uint64_t)histhue[fil] * fil; acchue += histhue[fil]; if (medhue == -1 && acchue > s->cfs / 2)

1 0

avcodec/mediacodecenc: workaround the alignment requirement for H.265
by Zhao Zhili 31 May '24

31 May '24

ffmpeg | branch: release/7.0 | Zhao Zhili <zhilizhao(a)tencent.com> | Thu May 23 23:13:39 2024 +0800| [f0b747ef1a9b9bfd0942a6d459f642b4b993b378] | committer: Zhao Zhili avcodec/mediacodecenc: workaround the alignment requirement for H.265 Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0b747ef1a9b9bfd0… --- libavcodec/mediacodecenc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c index a898e335b5..d3bf27cb7f 100644 --- a/libavcodec/mediacodecenc.c +++ b/libavcodec/mediacodecenc.c @@ -201,9 +201,18 @@ static av_cold int mediacodec_init(AVCodecContext *avctx) // Workaround the alignment requirement of mediacodec. We can't do it // silently for AV_PIX_FMT_MEDIACODEC. if (avctx->pix_fmt != AV_PIX_FMT_MEDIACODEC && - avctx->codec_id == AV_CODEC_ID_H264) { + (avctx->codec_id == AV_CODEC_ID_H264 || + avctx->codec_id == AV_CODEC_ID_HEVC)) { s->width = FFALIGN(avctx->width, 16); s->height = FFALIGN(avctx->height, 16); + // If avctx video size is aligned to 16 already, we don't need to do + // anything. If align is needed for HEVC, we should use the maximum CTU + // size. + if (avctx->codec_id == AV_CODEC_ID_HEVC && + (s->width != avctx->width || s->height != avctx->height)) { + s->width = FFALIGN(avctx->width, 64); + s->height = FFALIGN(avctx->height, 64); + } } else { s->width = avctx->width; s->height = avctx->height;

1 0

avcodec/mediacodecenc: workaround the alignment requirement only for H.264
by Zhao Zhili 31 May '24

31 May '24

ffmpeg | branch: release/7.0 | Zhao Zhili <zhilizhao(a)tencent.com> | Thu May 23 23:13:38 2024 +0800| [edc7b57e26372e7bc3f6c2f03408b6e4f94a9ddc] | committer: Zhao Zhili avcodec/mediacodecenc: workaround the alignment requirement only for H.264 There is no bsf for other codecs to modify crop info except H.265. For H.265, the assumption that FFALIGN(width, 16)xFFALIGN(height, 16) is the video resolution can be wrong, since the encoder can use CTU larger than 16x16. In that case, use FFALIGN(width, 16) - width as crop_right is incorrect. So disable the workaround for H.265 now. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edc7b57e26372e7bc… --- libavcodec/mediacodecenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c index fcb84ef0ac..a898e335b5 100644 --- a/libavcodec/mediacodecenc.c +++ b/libavcodec/mediacodecenc.c @@ -200,7 +200,8 @@ static av_cold int mediacodec_init(AVCodecContext *avctx) ff_AMediaFormat_setString(format, "mime", codec_mime); // Workaround the alignment requirement of mediacodec. We can't do it // silently for AV_PIX_FMT_MEDIACODEC. - if (avctx->pix_fmt != AV_PIX_FMT_MEDIACODEC) { + if (avctx->pix_fmt != AV_PIX_FMT_MEDIACODEC && + avctx->codec_id == AV_CODEC_ID_H264) { s->width = FFALIGN(avctx->width, 16); s->height = FFALIGN(avctx->height, 16); } else {

1 0

tests/checkasm/vvc_mc: don't zero the SAD buffers
by James Almer 31 May '24

31 May '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed May 29 11:02:39 2024 -0300| [4008a80c1bed313fb0e6cbe5098304cb152abad0] | committer: Nuo Mi tests/checkasm/vvc_mc: don't zero the SAD buffers They will be filled immediately after. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4008a80c1bed313fb… --- tests/checkasm/vvc_mc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/checkasm/vvc_mc.c b/tests/checkasm/vvc_mc.c index 40be837d68..bc6b580f42 100644 --- a/tests/checkasm/vvc_mc.c +++ b/tests/checkasm/vvc_mc.c @@ -333,9 +333,6 @@ static void check_vvc_sad(void) declare_func(int, const int16_t *src0, const int16_t *src1, int dx, int dy, int block_w, int block_h); ff_vvc_dsp_init(&c, bit_depth); - memset(src0, 0, MAX_CTU_SIZE * MAX_CTU_SIZE * 4 * sizeof(uint16_t)); - memset(src1, 0, MAX_CTU_SIZE * MAX_CTU_SIZE * 4 * sizeof(uint16_t)); - randomize_pixels(src0, src1, MAX_CTU_SIZE * MAX_CTU_SIZE * 4); for (int h = 8; h <= 16; h *= 2) { for (int w = 8; w <= 16; w *= 2) {

1 0

tests/checkasm/vvc_mc: fix indentation
by James Almer 31 May '24

31 May '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed May 29 11:02:38 2024 -0300| [b70289f35446ce79c25255a60bd91db69584c353] | committer: Nuo Mi tests/checkasm/vvc_mc: fix indentation Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b70289f35446ce79c… --- tests/checkasm/vvc_mc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/checkasm/vvc_mc.c b/tests/checkasm/vvc_mc.c index 09cac82edb..40be837d68 100644 --- a/tests/checkasm/vvc_mc.c +++ b/tests/checkasm/vvc_mc.c @@ -341,8 +341,10 @@ static void check_vvc_sad(void) for (int w = 8; w <= 16; w *= 2) { for(int offy = 0; offy <= 4; offy++) { for(int offx = 0; offx <= 4; offx++) { - if(w * h >= 128) { - if(check_func(c.inter.sad, "sad_%dx%d", w, h)) { + if (w * h < 128) + continue; + + if (check_func(c.inter.sad, "sad_%dx%d", w, h)) { int result0; int result1; @@ -353,7 +355,6 @@ static void check_vvc_sad(void) fail(); if(offx == 0 && offy == 0) bench_new(src0 + PIXEL_STRIDE * 2 + 2, src1 + PIXEL_STRIDE * 2 + 2, offx, offy, w, h); - } } } }

1 0

tests/checkasm/vvc_alf: change alf step size to 8
by Wu Jianhua 31 May '24

31 May '24

ffmpeg | branch: master | Wu Jianhua <toqsxw(a)outlook.com> | Fri May 31 00:28:07 2024 +0800| [442e94e5e476710dfbb9f611a86ac3c86156394c] | committer: Nuo Mi tests/checkasm/vvc_alf: change alf step size to 8 >From Benjamin Bross: > for ALF where functions are in increments of 4 while 8 should be sufficient according to the spec. Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=442e94e5e476710df… --- tests/checkasm/vvc_alf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/checkasm/vvc_alf.c b/tests/checkasm/vvc_alf.c index f35fd2cd3e..84b0f9da15 100644 --- a/tests/checkasm/vvc_alf.c +++ b/tests/checkasm/vvc_alf.c @@ -90,8 +90,8 @@ static void check_alf_filter(VVCDSPContext *c, const int bit_depth) randomize_buffers2(filter, LUMA_PARAMS_SIZE, 1); randomize_buffers2(clip, LUMA_PARAMS_SIZE, 0); - for (int h = 4; h <= MAX_CTU_SIZE; h += 4) { - for (int w = 4; w <= MAX_CTU_SIZE; w += 4) { + for (int h = 4; h <= MAX_CTU_SIZE; h += 8) { + for (int w = 4; w <= MAX_CTU_SIZE; w += 8) { const int ctu_size = MAX_CTU_SIZE; if (check_func(c->alf.filter[LUMA], "vvc_alf_filter_luma_%dx%d_%d", w, h, bit_depth)) { const int vb_pos = ctu_size - ALF_VB_POS_ABOVE_LUMA; @@ -142,8 +142,8 @@ static void check_alf_classify(VVCDSPContext *c, const int bit_depth) randomize_buffers(src0, src1, SRC_BUF_SIZE); - for (int h = 4; h <= MAX_CTU_SIZE; h += 4) { - for (int w = 4; w <= MAX_CTU_SIZE; w += 4) { + for (int h = 4; h <= MAX_CTU_SIZE; h += 8) { + for (int w = 4; w <= MAX_CTU_SIZE; w += 8) { const int id_size = w * h / ALF_BLOCK_SIZE / ALF_BLOCK_SIZE * sizeof(int); const int vb_pos = MAX_CTU_SIZE - ALF_BLOCK_SIZE; if (check_func(c->alf.classify, "vvc_alf_classify_%dx%d_%d", w, h, bit_depth)) {

1 0