July 2024 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/snow: Fix off by 1 error in run_buffer
by Michael Niedermayer 01 Aug '24

01 Aug '24

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Jul 31 21:43:39 2024 +0200| [06f5ed40f8fceb2542add052c57608121eda2f41] | committer: Michael Niedermayer avcodec/snow: Fix off by 1 error in run_buffer Fixes: out of array access Fixes: 70741/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SNOW_fuzzer-5703668010647552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06f5ed40f8fceb254… --- libavcodec/snow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 0285362d43..af6214d077 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -428,7 +428,7 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ !FF_ALLOCZ_TYPED_ARRAY(s->spatial_dwt_buffer, width * height) || //FIXME this does not belong here !FF_ALLOCZ_TYPED_ARRAY(s->temp_dwt_buffer, width) || !FF_ALLOCZ_TYPED_ARRAY(s->temp_idwt_buffer, width) || - !FF_ALLOCZ_TYPED_ARRAY(s->run_buffer, ((width + 1) >> 1) * ((height + 1) >> 1))) + !FF_ALLOCZ_TYPED_ARRAY(s->run_buffer, ((width + 1) >> 1) * ((height + 1) >> 1) + 1)) return AVERROR(ENOMEM); for(i=0; i<MAX_REF_FRAMES; i++) {

1 0

avcodec/utils: apply the same alignment to YUV410 as we do to YUV420 for snow
by Michael Niedermayer 01 Aug '24

01 Aug '24

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Jun 17 13:31:02 2024 +0200| [58fbeb59e74ac9a4ca81e9bc44141abcbff8ab6d] | committer: Michael Niedermayer avcodec/utils: apply the same alignment to YUV410 as we do to YUV420 for snow The snow encoder uses block based motion estimation which can read out of array if insufficient alignment is used It may be better to only apply this for the encoder, as it would safe a few bytes of memory for the decoder. Until then, this fixes the issue in a simple way. Fixes: out of array access Fixes: 68963/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SNOW_fuzzer-4979988435632128 Fixes: 68969/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SNOW_fuzzer-6239933667803136.fuzz Fixed: 70497/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SNOW_fuzzer-5751882631413760 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58fbeb59e74ac9a4c… --- libavcodec/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 337c00e789..7914f79904 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -259,6 +259,9 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, if (s->codec_id == AV_CODEC_ID_SVQ1) { w_align = 64; h_align = 64; + } else if (s->codec_id == AV_CODEC_ID_SNOW) { + w_align = 16; + h_align = 16; } break; case AV_PIX_FMT_RGB555:

1 0

avformat/iamf_parse: Check for 0 samples
by Michael Niedermayer 01 Aug '24

01 Aug '24

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Jul 31 20:06:49 2024 +0200| [ed96ac87a94aa0943412af93ef51c22cdc4c907c] | committer: Michael Niedermayer avformat/iamf_parse: Check for 0 samples Fixes: division by zero Fixes: 70561/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6199435013455872 Fixes: 70565/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5783790316748800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed96ac87a94aa0943… --- libavformat/iamf_parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index cdfd5f75fe..e007d6a7af 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -252,7 +252,7 @@ static int codec_config_obu(void *s, IAMFContext *c, AVIOContext *pb, int len) if (ret < 0) goto fail; - if ((codec_config->nb_samples > INT_MAX) || + if ((codec_config->nb_samples > INT_MAX) || codec_config->nb_samples <= 0 || (-codec_config->audio_roll_distance > INT_MAX / codec_config->nb_samples)) { ret = AVERROR_INVALIDDATA; goto fail;

1 0

lavu/riscv: Revert d808070, removing AV_READ_TIME
by Nathan E. Egge 31 Jul '24

31 Jul '24

ffmpeg | branch: master | Nathan E. Egge <unlord(a)xiph.org> | Sun Jul 28 17:10:51 2024 +0000| [8280ec7a3213c9b7bad88aac3695be2dedd2c00b] | committer: Rémi Denis-Courmont lavu/riscv: Revert d808070, removing AV_READ_TIME The implementation of ff_read_time() for RISC-V uses rdtime which has precision on existing hardware too low (!) for benchmarking purposes. Deleting this implementation falls back on clock_gettime() which was added as the default ff_read_time() implementation in 33e4cc9. Below are metrics gathered on SpacemiT K1, before and after this commit: Before: $ tests/checkasm/checkasm --bench benchmarking with native FFmpeg timers nop: 0.0 checkasm: using random seed 3473665261 checkasm: bench runs 1024 (1 << 10) RVI: - pixblockdsp.get_pixels [OK] - vc1dsp.mspel_pixels [OK] RVF: - audiodsp.audiodsp [OK] checkasm: all 4 tests passed audiodsp.vector_clipf_c: 1388.7 audiodsp.vector_clipf_rvf: 261.5 get_pixels_c: 2.0 get_pixels_rvi: 1.5 vc1dsp.put_vc1_mspel_pixels_tab[0][0]_c: 8.0 vc1dsp.put_vc1_mspel_pixels_tab[0][0]_rvi: 1.0 vc1dsp.put_vc1_mspel_pixels_tab[1][0]_c: 2.0 vc1dsp.put_vc1_mspel_pixels_tab[1][0]_rvi: 0.5 After: $ tests/checkasm/checkasm --bench benchmarking with native FFmpeg timers nop: 56.4 checkasm: using random seed 1021411603 checkasm: bench runs 1024 (1 << 10) RVI: - pixblockdsp.get_pixels [OK] - vc1dsp.mspel_pixels [OK] RVF: - audiodsp.audiodsp [OK] checkasm: all 4 tests passed audiodsp.vector_clipf_c: 23236.4 audiodsp.vector_clipf_rvf: 11038.4 get_pixels_c: 79.6 get_pixels_rvi: 48.4 vc1dsp.put_vc1_mspel_pixels_tab[0][0]_c: 329.6 vc1dsp.put_vc1_mspel_pixels_tab[0][0]_rvi: 38.1 vc1dsp.put_vc1_mspel_pixels_tab[1][0]_c: 89.9 vc1dsp.put_vc1_mspel_pixels_tab[1][0]_rvi: 17.1 Signed-off-by: Rémi Denis-Courmont <remi(a)remlab.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8280ec7a3213c9b7b… --- libavutil/riscv/timer.h | 54 ------------------------------------------------- libavutil/timer.h | 2 -- 2 files changed, 56 deletions(-) diff --git a/libavutil/riscv/timer.h b/libavutil/riscv/timer.h deleted file mode 100644 index 174b469cbe..0000000000 --- a/libavutil/riscv/timer.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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 AVUTIL_RISCV_TIMER_H -#define AVUTIL_RISCV_TIMER_H - -#include "config.h" - -#if HAVE_INLINE_ASM -#include <stdint.h> - -static inline uint64_t ff_read_time(void) -{ -#if (__riscv_xlen >= 64) - uintptr_t cycles; - - __asm__ volatile ("rdtime %0" : "=r" (cycles)); - -#else - uint64_t cycles; - uint32_t hi, lo, check; - - __asm__ volatile ( - "1: rdtimeh %0\n" - " rdtime %1\n" - " rdtimeh %2\n" - " bne %0, %2, 1b\n" : "=r" (hi), "=r" (lo), "=r" (check)); - - cycles = (((uint64_t)hi) << 32) | lo; - -#endif - return cycles; -} - -#define AV_READ_TIME ff_read_time -#define FF_TIMER_UNITS "ticks" - -#endif -#endif /* AVUTIL_RISCV_TIMER_H */ diff --git a/libavutil/timer.h b/libavutil/timer.h index 9fe6aa1385..663daf81c6 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -61,8 +61,6 @@ # include "arm/timer.h" #elif ARCH_PPC # include "ppc/timer.h" -#elif ARCH_RISCV -# include "riscv/timer.h" #elif ARCH_X86 # include "x86/timer.h" #elif ARCH_LOONGARCH

1 0

avcodec/Makefile: use the correct path for aacdec_fixed.o when setting its dependencies
by James Almer 31 Jul '24

31 Jul '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Jul 31 11:31:25 2024 -0300| [ab5c612137a8b8829abda35fc8a752173b52531a] | committer: James Almer avcodec/Makefile: use the correct path for aacdec_fixed.o when setting its dependencies Fixes ticket #11112 Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab5c612137a8b8829… --- libavcodec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 771e2b597e..262d0a3d3e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1350,7 +1350,7 @@ $(GEN_HEADERS): $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF) ifdef CONFIG_HARDCODED_TABLES $(SUBDIR)cbrt_data.o: $(SUBDIR)cbrt_tables.h $(SUBDIR)cbrt_data_fixed.o: $(SUBDIR)cbrt_fixed_tables.h -$(SUBDIR)aacdec_fixed.o: $(SUBDIR)sinewin_fixed_tables.h +$(SUBDIR)aac/aacdec_fixed.o: $(SUBDIR)sinewin_fixed_tables.h $(SUBDIR)aacps_float.o: $(SUBDIR)aacps_tables.h $(SUBDIR)aacps_fixed.o: $(SUBDIR)aacps_fixed_tables.h $(SUBDIR)dvenc.o: $(SUBDIR)dv_tables.h

1 0

avcodec/pcm-bluray/dvd: Use correct pointer types on BE
by Andreas Rheinhardt 31 Jul '24

31 Jul '24

ffmpeg | branch: release/7.0 | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 05:35:36 2024 +0100| [517e559a46b661ab7ba4aa03abc45b43ec381700] | committer: James Almer avcodec/pcm-bluray/dvd: Use correct pointer types on BE Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> (cherry picked from commit 347a70f101be28f8d78e8fd62ffc3a78324f49e9) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=517e559a46b661ab7… --- libavcodec/pcm-bluray.c | 5 +++-- libavcodec/pcm-dvd.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c index f65609514a..235020d78f 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, samples *= num_source_channels; if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, buf_size); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size); #else do { *dst16++ = bytestream2_get_be16u(&gb); @@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { do { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, + avctx->ch_layout.nb_channels * 2); dst16 += avctx->ch_layout.nb_channels; #else channel = avctx->ch_layout.nb_channels; diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c index 419b2a138f..319746c62e 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src, switch (avctx->bits_per_coded_sample) { case 16: { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, blocks * s->block_size); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size); dst16 += blocks * s->block_size / 2; #else int samples = blocks * avctx->ch_layout.nb_channels;

1 0

lavfi/framesync: avoid forcing frame writability unnecessarily
by Anton Khirnov 31 Jul '24

31 Jul '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Jul 24 17:10:41 2024 +0200| [43f702a2532c7ddd84160a0a46ed36ad6f4b7c0a] | committer: Anton Khirnov lavfi/framesync: avoid forcing frame writability unnecessarily Callers of ff_framesync_get_frame() generally do not expect the result to be writable, those that do (e.g. ff_framesync_dualinput_get_writable()) ensure writability themselves. Significantly reduces memory consumption in complex graphs with framesync-based filters (e.g. scale, ssim). Reported-By: Mark Shwartzman > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43f702a2532c7ddd8… --- libavfilter/framesync.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c index 535fbe9c7c..8e06e0e700 100644 --- a/libavfilter/framesync.c +++ b/libavfilter/framesync.c @@ -273,7 +273,6 @@ int ff_framesync_get_frame(FFFrameSync *fs, unsigned in, AVFrame **rframe, AVFrame *frame; unsigned need_copy = 0, i; int64_t pts_next; - int ret; if (!fs->in[in].frame) { *rframe = NULL; @@ -291,10 +290,6 @@ int ff_framesync_get_frame(FFFrameSync *fs, unsigned in, AVFrame **rframe, if (need_copy) { if (!(frame = av_frame_clone(frame))) return AVERROR(ENOMEM); - if ((ret = ff_inlink_make_frame_writable(fs->parent->inputs[in], &frame)) < 0) { - av_frame_free(&frame); - return ret; - } } else { fs->in[in].frame = NULL; }

1 0

lavc/videodsp: RISC-V zicbop prefetch
by Rémi Denis-Courmont 30 Jul '24

30 Jul '24

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Fri Sep 23 18:09:54 2022 +0300| [262168b04e6807fce6a78507c14cfc166ba72845] | committer: Rémi Denis-Courmont lavc/videodsp: RISC-V zicbop prefetch There are currently no ways to run-time detect the CPU capability, so we take it for granted (in the worst case, it will execute NOPs). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=262168b04e6807fce… --- libavcodec/riscv/Makefile | 2 ++ libavcodec/riscv/videodsp.S | 34 ++++++++++++++++++++++++++++++++++ libavcodec/riscv/videodsp_init.c | 36 ++++++++++++++++++++++++++++++++++++ libavcodec/videodsp.c | 2 ++ libavcodec/videodsp.h | 1 + 5 files changed, 75 insertions(+) diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index a6cdcb71e9..1491b6c067 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -67,6 +67,8 @@ RVV-OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_rvv.o OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_init.o RV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvi.o RVV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvv.o +OBJS-$(CONFIG_VIDEODSP) += riscv/videodsp_init.o +RV-OBJS-$(CONFIG_VIDEODSP) += riscv/videodsp.o OBJS-$(CONFIG_VP7_DECODER) += riscv/vp7dsp_init.o RVV-OBJS-$(CONFIG_VP7_DECODER) += riscv/vp7dsp_rvv.o OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_init.o diff --git a/libavcodec/riscv/videodsp.S b/libavcodec/riscv/videodsp.S new file mode 100644 index 0000000000..72bf70ec52 --- /dev/null +++ b/libavcodec/riscv/videodsp.S @@ -0,0 +1,34 @@ +/* + * Copyright © 2022 Rémi Denis-Courmont. + * + * 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 + */ + +#include "config.h" +#include "libavutil/riscv/asm.S" + +#if HAVE_RV_ZICBOP +func ff_prefetch_rv_zicbop, zicbop +1: + addi a2, a2, -1 + prefetch.r (a0) + add a0, a0, a1 + bnez a2, 1b + + ret +endfunc +#endif diff --git a/libavcodec/riscv/videodsp_init.c b/libavcodec/riscv/videodsp_init.c new file mode 100644 index 0000000000..f2c9aae3ca --- /dev/null +++ b/libavcodec/riscv/videodsp_init.c @@ -0,0 +1,36 @@ +/* + * 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 + */ + +#include "config.h" +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavcodec/videodsp.h" + +void ff_prefetch_rv_zicbop(const uint8_t *mem, ptrdiff_t stride, int h); + +av_cold void ff_videodsp_init_riscv(VideoDSPContext *ctx, int bpc) +{ +#if HAVE_RV_ZICBOP + /* TODO: Since we pay for the indirect function call anyway, we should + * only set this if Cache-Block Operation Prefetch (Zicbop) is actually + * supported and otherwise save a few cycles of NOPs. + * But so far there are no means to detect Zicbop (in user mode). + */ + ctx->prefetch = ff_prefetch_rv_zicbop; +#endif +} diff --git a/libavcodec/videodsp.c b/libavcodec/videodsp.c index bdff2e76f5..a19e87a819 100644 --- a/libavcodec/videodsp.c +++ b/libavcodec/videodsp.c @@ -51,6 +51,8 @@ av_cold void ff_videodsp_init(VideoDSPContext *ctx, int bpc) ff_videodsp_init_arm(ctx, bpc); #elif ARCH_PPC ff_videodsp_init_ppc(ctx, bpc); +#elif ARCH_RISCV + ff_videodsp_init_riscv(ctx, bpc); #elif ARCH_X86 ff_videodsp_init_x86(ctx, bpc); #elif ARCH_MIPS diff --git a/libavcodec/videodsp.h b/libavcodec/videodsp.h index e8960b609d..1be3188d09 100644 --- a/libavcodec/videodsp.h +++ b/libavcodec/videodsp.h @@ -81,6 +81,7 @@ void ff_videodsp_init(VideoDSPContext *ctx, int bpc); void ff_videodsp_init_aarch64(VideoDSPContext *ctx, int bpc); void ff_videodsp_init_arm(VideoDSPContext *ctx, int bpc); void ff_videodsp_init_ppc(VideoDSPContext *ctx, int bpc); +void ff_videodsp_init_riscv(VideoDSPContext *ctx, int bpc); void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc); void ff_videodsp_init_mips(VideoDSPContext *ctx, int bpc); void ff_videodsp_init_loongarch(VideoDSPContext *ctx, int bpc);

1 0

configure: check if assembler supports RV zicbop
by Rémi Denis-Courmont 30 Jul '24

30 Jul '24

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Fri Sep 23 18:09:18 2022 +0300| [4570b9f3c4e64a996bcadc5af58574f7f32ee1de] | committer: Rémi Denis-Courmont configure: check if assembler supports RV zicbop zicbop is the Cache Block Operation, Prefetch extension to RVI. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4570b9f3c4e64a996… --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index 770a637aad..37178d7d81 100755 --- a/configure +++ b/configure @@ -2218,6 +2218,7 @@ ARCH_EXT_LIST_PPC=" ARCH_EXT_LIST_RISCV=" rv rvv + rv_zicbop rv_zvbb " @@ -2763,6 +2764,7 @@ power8_deps="vsx" rv_deps="riscv" rvv_deps="rv" +rv_zicbop="riscv" rv_zvbb_deps="rvv" loongson2_deps="mips" @@ -6366,6 +6368,7 @@ elif enabled riscv; then enabled rv && check_inline_asm rv '".option arch, +zbb\nrev8 t0, t1"' enabled rvv && check_inline_asm rvv '".option arch, +v\nvsetivli zero, 0, e8, m1, ta, ma"' + enabled rv_zicbop && check_inline_asm rv_zicbop '".option arch, +zicbop\nprefetch.r 64(a0)"' enabled rv_zvbb && check_inline_asm rv_zvbb '".option arch, +zvbb\nvclz.v v0, v8"' elif enabled x86; then @@ -7922,6 +7925,7 @@ if enabled loongarch; then echo "LASX enabled ${lasx-no}" fi if enabled riscv; then + echo "RISC-V CBO Prefetch ${rv_zicbop-no}" echo "RISC-V Vector enabled ${rvv-no}" fi echo "debug symbols ${debug-no}"

1 0

lavc/vc1dsp: use saturating arithmetic for RVV inv_trans_dc
by Rémi Denis-Courmont 30 Jul '24

30 Jul '24

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Sat Jul 27 18:31:07 2024 +0300| [324eba69f7193367a28f31411f5ded9d7eb2eb48] | committer: Rémi Denis-Courmont lavc/vc1dsp: use saturating arithmetic for RVV inv_trans_dc T-Head C908 (cycles): vc1dsp.vc1_inv_trans_4x4_dc_c: 113.7 vc1dsp.vc1_inv_trans_4x4_dc_rvv_i32: 46.5 (before) vc1dsp.vc1_inv_trans_4x4_dc_rvv_i32: 45.5 (after) vc1dsp.vc1_inv_trans_4x8_dc_c: 230.7 vc1dsp.vc1_inv_trans_4x8_dc_rvv_i32: 65.7 (before) vc1dsp.vc1_inv_trans_4x8_dc_rvv_i32: 52.5 (after) vc1dsp.vc1_inv_trans_8x4_dc_c: 246.7 vc1dsp.vc1_inv_trans_8x4_dc_rvv_i64: 56.7 (before) vc1dsp.vc1_inv_trans_8x4_dc_rvv_i64: 45.5 (after) vc1dsp.vc1_inv_trans_8x8_dc_c: 419.7 vc1dsp.vc1_inv_trans_8x8_dc_rvv_i64: 81.2 (before) vc1dsp.vc1_inv_trans_8x8_dc_rvv_i64: 53.5 (after) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=324eba69f7193367a… --- libavcodec/riscv/vc1dsp_rvv.S | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/libavcodec/riscv/vc1dsp_rvv.S b/libavcodec/riscv/vc1dsp_rvv.S index 548ef9d3bf..f9b59688ae 100644 --- a/libavcodec/riscv/vc1dsp_rvv.S +++ b/libavcodec/riscv/vc1dsp_rvv.S @@ -38,18 +38,20 @@ func ff_vc1_inv_trans_\cols\()x\rows\()_dc_rvv, zve64x, zba .endif addi t2, t2, 64 srai t2, t2, 7 -.if \rows * \cols == 64 - vsetvli zero, t0, e16, m8, ta, ma -.elseif \rows * \cols == 32 - vsetvli zero, t0, e16, m4, ta, ma +.if \rows * \cols >= 32 + vsetvli zero, t0, e8, m\mat_lmul, ta, ma .else - vsetivli zero, \rows * \cols, e16, m2, ta, ma + vsetivli zero, \rows * \cols, e8, m\mat_lmul, ta, ma .endif - vzext.vf2 v8, v0 - vadd.vx v8, v8, t2 - vmax.vx v8, v8, zero - vsetvli zero, zero, e8, m\mat_lmul, ta, ma - vnclipu.wi v0, v8, 0 + bgez t2, 1f + + neg t2, t2 + vssubu.vx v0, v0, t2 + vsetivli zero, \rows, e8, m\row_lmul, ta, ma + vsse\w\().v v0, (a0), a1 + ret +1: + vsaddu.vx v0, v0, t2 vsetivli zero, \rows, e8, m\row_lmul, ta, ma vsse\w\().v v0, (a0), a1 ret

1 0