July 2024 - ffmpeg-devel - lists.ffmpeg.org

[PATCH 1/3] avfilter/af_afftdn: Assert format
by Michael Niedermayer 07 Jul '24

07 Jul '24

Maybe helps: CID1515514 Uninitialized scalar variable Maybe helps: CID1515517 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavfilter/af_afftdn.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/af_afftdn.c b/libavfilter/af_afftdn.c index 96c2246074c..a2e6ca61076 100644 --- a/libavfilter/af_afftdn.c +++ b/libavfilter/af_afftdn.c @@ -20,6 +20,7 @@ #include <float.h> +#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/mem.h" @@ -376,6 +377,8 @@ static void process_frame(AVFilterContext *ctx, case AV_SAMPLE_FMT_DBLP: noisy_data[i] = mag = hypot(fft_data_dbl[i].re, fft_data_dbl[i].im); break; + default: + av_assert2(0); } power = mag * mag; @@ -970,6 +973,8 @@ static void sample_noise_block(AudioFFTDeNoiseContext *s, mag2 = fft_out_dbl[n].re * fft_out_dbl[n].re + fft_out_dbl[n].im * fft_out_dbl[n].im; break; + default: + av_assert2(0); } mag2 = fmax(mag2, s->sample_floor); -- 2.45.2

1 3

[PATCH] MAINTAINERS: add myself to the general developers list
by fei.w.wang＠intel.com 07 Jul '24

07 Jul '24

From: Fei Wang <fei.w.wang(a)intel.com> Signed-off-by: Fei Wang <fei.w.wang(a)intel.com> --- It has been 4.5 years since my 1st patch to FFmpeg. During the past years, I have fully understand the rules of a committer. Because sometimes, patch send to community will be stay there without review or patch get reviewed and approved but can't be get merged. So to make the work more efficient and to contribute some of my help as a committer, I'd like to apply to get write access. Thanks. MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index a82fa58c69..d794e58163 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -514,6 +514,7 @@ Benjamin Larsson Bobby Bingham Daniel Verkamp Derek Buitenhuis +Fei Wang Ganesh Ajjanagadde Henrik Gramner Ivan Uskov -- 2.34.1

3 2

[PATCH] tools/coverity: Phase 1 study of anti-halicogenic for coverity av_rescale()
by Michael Niedermayer 07 Jul '24

07 Jul '24

Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- tools/coverity.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools/coverity.c b/tools/coverity.c index 19a132a9767..541e108238d 100644 --- a/tools/coverity.c +++ b/tools/coverity.c @@ -31,6 +31,17 @@ #define NULL (void *)0 +typedef long long int64_t; + +enum AVRounding { + AV_ROUND_ZERO = 0, + AV_ROUND_INF = 1, + AV_ROUND_DOWN = 2, + AV_ROUND_UP = 3, + AV_ROUND_NEAR_INF = 5, + AV_ROUND_PASS_MINMAX = 8192, +}; + // Based on https://scan.coverity.com/models void *av_malloc(size_t size) { int has_memory; @@ -77,3 +88,10 @@ void *av_free(void *ptr) { __coverity_mark_as_afm_freed__(ptr, "av_free"); } + +int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd) { + __coverity_negative_sink__(b); + __coverity_negative_sink__(c); + + return (double)a * (double)b / (double)c; +} -- 2.45.2

1 1

[PATCH 1/4] avfilter/af_aresample: Cleanup on av_channel_layout_copy() failure
by Michael Niedermayer 07 Jul '24

07 Jul '24

Fixes: CID1503078 Resource leak Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavfilter/af_aresample.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index d6bd77beb32..8ff2fe5973f 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -195,8 +195,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamplesref) av_frame_copy_props(outsamplesref, insamplesref); outsamplesref->format = outlink->format; ret = av_channel_layout_copy(&outsamplesref->ch_layout, &outlink->ch_layout); - if (ret < 0) + if (ret < 0) { + av_frame_free(&outsamplesref); + av_frame_free(&insamplesref); return ret; + } outsamplesref->sample_rate = outlink->sample_rate; if(insamplesref->pts != AV_NOPTS_VALUE) { -- 2.45.2

1 4

[PATCH] lavc/h264dsp: R-V V 8-bit chroma_dc_dequant_idct
by Rémi Denis-Courmont 07 Jul '24

07 Jul '24

Performance gains is around 0.5% on K230 cycle counter, and not measurable with the architecture timer, so probably no worth merging. --- libavcodec/riscv/h264dsp_init.c | 4 +++ libavcodec/riscv/h264idct_rvv.S | 57 +++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index 88afec8df0..8a83e2dee2 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -51,6 +51,7 @@ void ff_h264_idct_add16intra_8_rvv(uint8_t *dst, const int *blockoffset, void ff_h264_idct8_add4_8_rvv(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[5 * 8]); +void ff_h264_luma_dc_dequant_idct_8_rvv(int16_t *out, int16_t *in, int qmul); extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); @@ -84,6 +85,9 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, dsp->h264_idct_add16 = ff_h264_idct_add16_8_rvv; dsp->h264_idct_add16intra = ff_h264_idct_add16intra_8_rvv; dsp->h264_idct8_add4 = ff_h264_idct8_add4_8_rvv; + if (flags & AV_CPU_FLAG_RVV_I64) + dsp->h264_luma_dc_dequant_idct = + ff_h264_luma_dc_dequant_idct_8_rvv; # endif } dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; diff --git a/libavcodec/riscv/h264idct_rvv.S b/libavcodec/riscv/h264idct_rvv.S index 370d162bf2..eeeba0c7eb 100644 --- a/libavcodec/riscv/h264idct_rvv.S +++ b/libavcodec/riscv/h264idct_rvv.S @@ -452,4 +452,61 @@ func ff_h264_idct8_add4_\depth\()_rvv, zve32x ret endfunc .endr + +func ff_h264_luma_dc_dequant_idct_8_rvv, zve64x + csrwi vxrm, 0 + vsetivli zero, 4, e16, mf2, ta, ma + vlseg4e16.v v0, (a1) + addi sp, sp, -16 * 2 + vadd.vv v8, v0, v1 # z0 + vsub.vv v10, v0, v1 # z1 + addi t1, sp, 1 * 4 * 2 + vsub.vv v12, v2, v3 # z2 + addi t2, sp, 2 * 4 * 2 + vadd.vv v14, v2, v3 # z3 + vadd.vv v0, v8, v14 + addi t3, sp, 3 * 4 * 2 + vsub.vv v1, v8, v14 + vsub.vv v2, v10, v12 + vadd.vv v3, v10, v12 + vsseg4e16.v v0, (sp) + vle16.v v0, (sp) + vle16.v v2, (t2) + vle16.v v1, (t1) + # same as 4-point iDCT but without right shifts + vadd.vv v8, v0, v2 # z0 + vle16.v v3, (t3) + vsub.vv v10, v0, v2 # z1 + addi sp, sp, 16 * 2 + vsub.vv v12, v1, v3 # z2 + lui t0, 0x50004 # 0x5000_4000 + vadd.vv v14, v1, v3 # z3 + vwadd.vv v0, v8, v14 + slli t0, t0, 16 - 12 # 0x5_0004_0000 + vwadd.vv v2, v10, v12 + vwsub.vv v4, v10, v12 + ori t0, t0, 1 # 0x5_0004_0001 + vwsub.vv v6, v8, v14 + vsetvli zero, zero, e32, m1, ta, ma + vmul.vx v0, v0, a2 + slli t0, t0, 1 + 16 + 4 + 1 # 0x00A0_0080_0020_0000 + vmul.vx v2, v2, a2 + vmul.vx v4, v4, a2 + addi t1, a0, 1 * 16 * 2 + vmul.vx v6, v6, a2 + vsetvli zero, zero, e64, m2, ta, ma + vmv.s.x v12, t0 + vsetvli zero, zero, e16, mf2, ta, ma + vnclip.wi v8, v0, 8 + addi t2, a0, 4 * 16 * 2 + vnclip.wi v9, v2, 8 + vnclip.wi v10, v4, 8 + addi t3, a0, 5 * 16 * 2 + vnclip.wi v11, v6, 8 + vsuxei16.v v8, (a0), v12 + vsuxei16.v v9, (t1), v12 + vsuxei16.v v10, (t2), v12 + vsuxei16.v v11, (t3), v12 + ret +endfunc #endif -- 2.45.2

1 0

[POC] lavfi: add perlin noise generator
by Stefano Sabatini 07 Jul '24

07 Jul '24

Hi, still missing documentation and might be optimized (and maybe extended to support gray16 - this should be simple), comments are welcome.

5 14

[PATCH 01/11] avformat/mov: add support for lhvC box parsing
by James Almer 07 Jul '24

07 Jul '24

Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavformat/mov.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index a3951a6942..30e8086855 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8157,6 +8157,53 @@ static int mov_read_dvcc_dvvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return ff_isom_parse_dvcc_dvvc(c->fc, st, buf, read_size); } +static int mov_read_lhvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + AVStream *st; + uint8_t *buf; + int ret, old_size, num_arrays; + + if (c->fc->nb_streams < 1) + return 0; + st = c->fc->streams[c->fc->nb_streams-1]; + + if (!st->codecpar->extradata_size) + // TODO: handle lhvC when present before hvcC + return 0; + + if (atom.size < 6 || st->codecpar->extradata_size < 23) + return AVERROR_INVALIDDATA; + + buf = av_malloc(atom.size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!buf) + return AVERROR(ENOMEM); + memset(buf + atom.size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + + ret = ffio_read_size(pb, buf, atom.size); + if (ret < 0) { + av_free(buf); + av_log(c->fc, AV_LOG_WARNING, "lhvC atom truncated\n"); + return 0; + } + + num_arrays = buf[5]; + old_size = st->codecpar->extradata_size; + atom.size -= 8 /* account for mov_realloc_extradata offseting */ + + 6 /* lhvC bytes before the arrays*/; + + ret = mov_realloc_extradata(st->codecpar, atom); + if (ret < 0) { + av_free(buf); + return ret; + } + + st->codecpar->extradata[22] += num_arrays; + memcpy(st->codecpar->extradata + old_size, buf + 6, atom.size + 8); + + av_free(buf); + return 0; +} + static int mov_read_kind(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVFormatContext *ctx = c->fc; @@ -8943,6 +8990,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('i','p','r','p'), mov_read_iprp }, { MKTAG('i','i','n','f'), mov_read_iinf }, { MKTAG('a','m','v','e'), mov_read_amve }, /* ambient viewing environment box */ +{ MKTAG('l','h','v','C'), mov_read_lhvc }, #if CONFIG_IAMFDEC { MKTAG('i','a','c','b'), mov_read_iacb }, #endif -- 2.45.2

2 15

[PATCH 1/2] lavc/h264dsp: remove MMI 8-bit chroma DC dequant
by Rémi Denis-Courmont 07 Jul '24

07 Jul '24

The function is exactly identical to the C reference, only with the constant propagated manually. It does not optimise anything. --- libavcodec/mips/h264dsp_init_mips.c | 5 +---- libavcodec/mips/h264dsp_mips.h | 1 - libavcodec/mips/h264dsp_mmi.c | 14 -------------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/libavcodec/mips/h264dsp_init_mips.c b/libavcodec/mips/h264dsp_init_mips.c index e33df32c71..615b00d142 100644 --- a/libavcodec/mips/h264dsp_init_mips.c +++ b/libavcodec/mips/h264dsp_init_mips.c @@ -46,10 +46,7 @@ av_cold void ff_h264dsp_init_mips(H264DSPContext *c, const int bit_depth, c->h264_luma_dc_dequant_idct = ff_h264_luma_dc_dequant_idct_8_mmi; - if (chroma_format_idc <= 1) - c->h264_chroma_dc_dequant_idct = - ff_h264_chroma_dc_dequant_idct_8_mmi; - else + if (chroma_format_idc > 1) c->h264_chroma_dc_dequant_idct = ff_h264_chroma422_dc_dequant_idct_8_mmi; diff --git a/libavcodec/mips/h264dsp_mips.h b/libavcodec/mips/h264dsp_mips.h index 93a201c66a..7e1dcdd013 100644 --- a/libavcodec/mips/h264dsp_mips.h +++ b/libavcodec/mips/h264dsp_mips.h @@ -340,7 +340,6 @@ void ff_h264_idct_add8_422_8_mmi(uint8_t **dest, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]); void ff_h264_luma_dc_dequant_idct_8_mmi(int16_t *output, int16_t *input, int qmul); -void ff_h264_chroma_dc_dequant_idct_8_mmi(int16_t *block, int qmul); void ff_h264_chroma422_dc_dequant_idct_8_mmi(int16_t *block, int qmul); void ff_h264_weight_pixels16_8_mmi(uint8_t *block, ptrdiff_t stride, int height, diff --git a/libavcodec/mips/h264dsp_mmi.c b/libavcodec/mips/h264dsp_mmi.c index dff3d331b1..1ee8ca2f1c 100644 --- a/libavcodec/mips/h264dsp_mmi.c +++ b/libavcodec/mips/h264dsp_mmi.c @@ -1117,20 +1117,6 @@ void ff_h264_chroma422_dc_dequant_idct_8_mmi(int16_t *block, int qmul) block[112]= (t[7]*qmul + 128) >> 8; } -void ff_h264_chroma_dc_dequant_idct_8_mmi(int16_t *block, int qmul) -{ - int a,b,c,d; - - d = block[0] - block[16]; - a = block[0] + block[16]; - b = block[32] - block[48]; - c = block[32] + block[48]; - block[0] = ((a+c)*qmul) >> 7; - block[16]= ((d+b)*qmul) >> 7; - block[32]= ((a-c)*qmul) >> 7; - block[48]= ((d-b)*qmul) >> 7; -} - void ff_h264_weight_pixels16_8_mmi(uint8_t *block, ptrdiff_t stride, int height, int log2_denom, int weight, int offset) { -- 2.45.2

1 2

0001-Fix-HLG-10bit-color-transfer
by 激情澎湃 07 Jul '24

07 Jul '24

激情澎湃 12685137(a)qq.com  

2 1

[PATCH] avcodec/videotoolboxenc: fix vtctx reset condition
by Hao Guan 07 Jul '24

07 Jul '24

In vtenc_populate_extradata, the cleanup function vtenc_reset should not be used when no error occurs, otherwise some color information is lost (#11036). This patch checks the status code and conducts the correct cleanup. Signed-off-by: Hao Guan <hguandl(a)gmail.com> --- libavcodec/videotoolboxenc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 15c34d59c3..0aa4885232 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -2766,7 +2766,14 @@ static int vtenc_populate_extradata(AVCodecContext *avctx, pe_cleanup: CVPixelBufferRelease(pix_buf); - vtenc_reset(vtctx); + + if (status) { + vtenc_reset(vtctx); + } else if (vtctx->session) { + CFRelease(vtctx->session); + vtctx->session = NULL; + } + vtctx->frame_ct_out = 0; av_assert0(status != 0 || (avctx->extradata && avctx->extradata_size > 0)); -- 2.39.3 (Apple Git-146)

2 1