diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile new file mode 100644 index 0000000000..879e6befee --- /dev/null +++ b/libavcodec/aarch64/Makefile @@ -0,0 +1,5 @@ +OBJS-$(CONFIG_H264CHROMA) += aarch64/h264chroma_init_aarch64.o +OBJS-$(CONFIG_RV40_DECODER) += aarch64/rv40dsp_init_aarch64.o +OBJS-$(CONFIG_VC1_DECODER) += aarch64/vc1dsp_init_aarch64.o + +NEON-OBJS-$(CONFIG_H264CHROMA) += aarch64/h264cmc_neon.o diff --git a/libavcodec/aarch64/h264chroma_init_aarch64.c b/libavcodec/aarch64/h264chroma_init_aarch64.c new file mode 100644 index 0000000000..2af62becf7 --- /dev/null +++ b/libavcodec/aarch64/h264chroma_init_aarch64.c @@ -0,0 +1,59 @@ +/* + * ARM NEON optimised H.264 chroma functions + * Copyright (c) 2008 Mans Rullgard + * + * 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 + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/aarch64/cpu.h" +#include "libavcodec/h264chroma.h" + +#include "config.h" + +void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, + int h, int x, int y); +void ff_put_h264_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, + int h, int x, int y); +void ff_put_h264_chroma_mc2_neon(uint8_t *dst, uint8_t *src, int stride, + int h, int x, int y); + +void ff_avg_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, + int h, int x, int y); +void ff_avg_h264_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, + int h, int x, int y); +void ff_avg_h264_chroma_mc2_neon(uint8_t *dst, uint8_t *src, int stride, + int h, int x, int y); + +av_cold void ff_h264chroma_init_aarch64(H264ChromaContext *c, int bit_depth) +{ + const int high_bit_depth = bit_depth > 8; + int cpu_flags = av_get_cpu_flags(); + + if (have_neon(cpu_flags) && !high_bit_depth) { + c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_neon; + c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_neon; + c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_neon; + + c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_neon; + c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_neon; + c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_neon; + } +} diff --git a/libavcodec/aarch64/h264cmc_neon.S b/libavcodec/aarch64/h264cmc_neon.S new file mode 100644 index 0000000000..a6ed877f2d --- /dev/null +++ b/libavcodec/aarch64/h264cmc_neon.S @@ -0,0 +1,402 @@ +/* + * Copyright (c) 2008 Mans Rullgard + * Copyright (c) 2013 Janne Grunau + * + * 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 "libavutil/aarch64/asm.S" + +/* chroma_mc8(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y) */ +.macro h264_chroma_mc8 type, codec=h264 +function ff_\type\()_\codec\()_chroma_mc8_neon, export=1 + sxtw x2, w2 + .ifc \type,avg + mov x8, x0 + .endif + prfm pldl1strm, [x1] + prfm pldl1strm, [x1, x2] + .ifc \codec,rv40 + movrel x6, rv40bias + lsr w9, w5, #1 + lsr w10, w4, #1 + lsl w9, w9, #3 + lsl w10, w10, #1 + add w9, w9, w10 + add x6, x6, w9, UXTW + ld1r {v22.8H}, [x6] + .endif + .ifc \codec,vc1 + movi v22.8H, #28 + .endif + mul w7, w4, w5 + lsl w14, w5, #3 + lsl w13, w4, #3 + cmp w7, #0 + sub w6, w14, w7 + sub w12, w13, w7 + sub w4, w7, w13 + sub w4, w4, w14 + add w4, w4, #64 + b.eq 2f + + dup v0.8B, w4 + dup v1.8B, w12 + ld1 {v4.8B, v5.8B}, [x1], x2 + dup v2.8B, w6 + dup v3.8B, w7 + ext v5.8B, v4.8B, v5.8B, #1 +1: ld1 {v6.8B, v7.8B}, [x1], x2 + umull v16.8H, v4.8B, v0.8B + umlal v16.8H, v5.8B, v1.8B + ext v7.8B, v6.8B, v7.8B, #1 + ld1 {v4.8B, v5.8B}, [x1], x2 + umlal v16.8H, v6.8B, v2.8B + prfm pldl1strm, [x1] + ext v5.8B, v4.8B, v5.8B, #1 + umlal v16.8H, v7.8B, v3.8B + umull v17.8H, v6.8B, v0.8B + subs w3, w3, #2 + umlal v17.8H, v7.8B, v1.8B + umlal v17.8H, v4.8B, v2.8B + umlal v17.8H, v5.8B, v3.8B + prfm pldl1strm, [x1, x2] + .ifc \codec,h264 + rshrn v16.8B, v16.8H, #6 + rshrn v17.8B, v17.8H, #6 + .else + add v16.8H, v16.8H, v22.8H + add v17.8H, v17.8H, v22.8H + shrn v16.8B, v16.8H, #6 + shrn v17.8B, v17.8H, #6 + .endif + .ifc \type,avg + ld1 {v20.8B}, [x8], x2 + ld1 {v21.8B}, [x8], x2 + urhadd v16.8B, v16.8B, v20.8B + urhadd v17.8B, v17.8B, v21.8B + .endif + st1 {v16.8B}, [x0], x2 + st1 {v17.8B}, [x0], x2 + b.gt 1b + ret + +2: tst w6, w6 + add w12, w12, w6 + dup v0.8B, w4 + dup v1.8B, w12 + b.eq 4f + + ld1 {v4.8B}, [x1], x2 +3: ld1 {v6.8B}, [x1], x2 + umull v16.8H, v4.8B, v0.8B + umlal v16.8H, v6.8B, v1.8B + ld1 {v4.8B}, [x1], x2 + umull v17.8H, v6.8B, v0.8B + umlal v17.8H, v4.8B, v1.8B + prfm pldl1strm, [x1] + .ifc \codec,h264 + rshrn v16.8B, v16.8H, #6 + rshrn v17.8B, v17.8H, #6 + .else + add v16.8H, v16.8H, v22.8H + add v17.8H, v17.8H, v22.8H + shrn v16.8B, v16.8H, #6 + shrn v17.8B, v17.8H, #6 + .endif + prfm pldl1strm, [x1, x2] + .ifc \type,avg + ld1 {v20.8B}, [x8], x2 + ld1 {v21.8B}, [x8], x2 + urhadd v16.8B, v16.8B, v20.8B + urhadd v17.8B, v17.8B, v21.8B + .endif + subs w3, w3, #2 + st1 {v16.8B}, [x0], x2 + st1 {v17.8B}, [x0], x2 + b.gt 3b + ret + +4: ld1 {v4.8B, v5.8B}, [x1], x2 + ld1 {v6.8B, v7.8B}, [x1], x2 + ext v5.8B, v4.8B, v5.8B, #1 + ext v7.8B, v6.8B, v7.8B, #1 + prfm pldl1strm, [x1] + subs w3, w3, #2 + umull v16.8H, v4.8B, v0.8B + umlal v16.8H, v5.8B, v1.8B + umull v17.8H, v6.8B, v0.8B + umlal v17.8H, v7.8B, v1.8B + prfm pldl1strm, [x1, x2] + .ifc \codec,h264 + rshrn v16.8B, v16.8H, #6 + rshrn v17.8B, v17.8H, #6 + .else + add v16.8H, v16.8H, v22.8H + add v17.8H, v17.8H, v22.8H + shrn v16.8B, v16.8H, #6 + shrn v17.8B, v17.8H, #6 + .endif + .ifc \type,avg + ld1 {v20.8B}, [x8], x2 + ld1 {v21.8B}, [x8], x2 + urhadd v16.8B, v16.8B, v20.8B + urhadd v17.8B, v17.8B, v21.8B + .endif + st1 {v16.8B}, [x0], x2 + st1 {v17.8B}, [x0], x2 + b.gt 4b + ret +endfunc +.endm + +/* chroma_mc4(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y) */ +.macro h264_chroma_mc4 type, codec=h264 +function ff_\type\()_\codec\()_chroma_mc4_neon, export=1 + sxtw x2, w2 + .ifc \type,avg + mov x8, x0 + .endif + prfm pldl1strm, [x1] + prfm pldl1strm, [x1, x2] + .ifc \codec,rv40 + movrel x6, rv40bias + lsr w9, w5, #1 + lsr w10, w4, #1 + lsl w9, w9, #3 + lsl w10, w10, #1 + add w9, w9, w10 + add x6, x6, w9, UXTW + ld1r {v22.8H}, [x6] + .endif + .ifc \codec,vc1 + movi v22.8H, #28 + .endif + mul w7, w4, w5 + lsl w14, w5, #3 + lsl w13, w4, #3 + cmp w7, #0 + sub w6, w14, w7 + sub w12, w13, w7 + sub w4, w7, w13 + sub w4, w4, w14 + add w4, w4, #64 + b.eq 2f + + dup v24.8B, w4 + dup v25.8B, w12 + ld1 {v4.8B}, [x1], x2 + dup v26.8B, w6 + dup v27.8B, w7 + ext v5.8B, v4.8B, v5.8B, #1 + trn1 v0.2S, v24.2S, v25.2S + trn1 v2.2S, v26.2S, v27.2S + trn1 v4.2S, v4.2S, v5.2S +1: ld1 {v6.8B}, [x1], x2 + ext v7.8B, v6.8B, v7.8B, #1 + trn1 v6.2S, v6.2S, v7.2S + umull v18.8H, v4.8B, v0.8B + umlal v18.8H, v6.8B, v2.8B + ld1 {v4.8B}, [x1], x2 + ext v5.8B, v4.8B, v5.8B, #1 + trn1 v4.2S, v4.2S, v5.2S + prfm pldl1strm, [x1] + umull v19.8H, v6.8B, v0.8B + umlal v19.8H, v4.8B, v2.8B + trn1 v30.2D, v18.2D, v19.2D + trn2 v31.2D, v18.2D, v19.2D + add v18.8H, v30.8H, v31.8H + .ifc \codec,h264 + rshrn v16.8B, v18.8H, #6 + .else + add v18.8H, v18.8H, v22.8H + shrn v16.8B, v18.8H, #6 + .endif + subs w3, w3, #2 + prfm pldl1strm, [x1, x2] + .ifc \type,avg + ld1 {v20.S}[0], [x8], x2 + ld1 {v20.S}[1], [x8], x2 + urhadd v16.8B, v16.8B, v20.8B + .endif + st1 {v16.S}[0], [x0], x2 + st1 {v16.S}[1], [x0], x2 + b.gt 1b + ret + +2: tst w6, w6 + add w12, w12, w6 + dup v30.8B, w4 + dup v31.8B, w12 + trn1 v0.2S, v30.2S, v31.2S + trn2 v1.2S, v30.2S, v31.2S + b.eq 4f + + ext v1.8B, v0.8B, v1.8B, #4 + ld1 {v4.S}[0], [x1], x2 +3: ld1 {v4.S}[1], [x1], x2 + umull v18.8H, v4.8B, v0.8B + ld1 {v4.S}[0], [x1], x2 + umull v19.8H, v4.8B, v1.8B + trn1 v30.2D, v18.2D, v19.2D + trn2 v31.2D, v18.2D, v19.2D + add v18.8H, v30.8H, v31.8H + prfm pldl1strm, [x1] + .ifc \codec,h264 + rshrn v16.8B, v18.8H, #6 + .else + add v18.8H, v18.8H, v22.8H + shrn v16.8B, v18.8H, #6 + .endif + .ifc \type,avg + ld1 {v20.S}[0], [x8], x2 + ld1 {v20.S}[1], [x8], x2 + urhadd v16.8B, v16.8B, v20.8B + .endif + subs w3, w3, #2 + prfm pldl1strm, [x1, x2] + st1 {v16.S}[0], [x0], x2 + st1 {v16.S}[1], [x0], x2 + b.gt 3b + ret + +4: ld1 {v4.8B}, [x1], x2 + ld1 {v6.8B}, [x1], x2 + ext v5.8B, v4.8B, v5.8B, #1 + ext v7.8B, v6.8B, v7.8B, #1 + trn1 v4.2S, v4.2S, v5.2S + trn1 v6.2S, v6.2S, v7.2S + umull v18.8H, v4.8B, v0.8B + umull v19.8H, v6.8B, v0.8B + subs w3, w3, #2 + trn1 v30.2D, v18.2D, v19.2D + trn2 v31.2D, v18.2D, v19.2D + add v18.8H, v30.8H, v31.8H + prfm pldl1strm, [x1] + .ifc \codec,h264 + rshrn v16.8B, v18.8H, #6 + .else + add v18.8H, v18.8H, v22.8H + shrn v16.8B, v18.8H, #6 + .endif + .ifc \type,avg + ld1 {v20.S}[0], [x8], x2 + ld1 {v20.S}[1], [x8], x2 + urhadd v16.8B, v16.8B, v20.8B + .endif + prfm pldl1strm, [x1] + st1 {v16.S}[0], [x0], x2 + st1 {v16.S}[1], [x0], x2 + b.gt 4b + ret +endfunc +.endm + +.macro h264_chroma_mc2 type +function ff_\type\()_h264_chroma_mc2_neon, export=1 + sxtw x2, w2 + prfm pldl1strm, [x1] + prfm pldl1strm, [x1, x2] + orr w7, w4, w5 + cbz w7, 2f + + mul w7, w4, w5 + lsl w14, w5, #3 + lsl w13, w4, #3 + sub w6, w14, w7 + sub w12, w13, w7 + sub w4, w7, w13 + sub w4, w4, w14 + add w4, w4, #64 + dup v0.8B, w4 + dup v2.8B, w12 + dup v1.8B, w6 + dup v3.8B, w7 + trn1 v0.4H, v0.4H, v2.4H + trn1 v1.4H, v1.4H, v3.4H +1: + ld1 {v4.S}[0], [x1], x2 + ld1 {v4.S}[1], [x1], x2 + rev64 v5.2S, v4.2S + ld1 {v5.S}[1], [x1] + ext v6.8B, v4.8B, v5.8B, #1 + ext v7.8B, v5.8B, v4.8B, #1 + trn1 v4.4H, v4.4H, v6.4H + trn1 v5.4H, v5.4H, v7.4H + umull v16.8H, v4.8B, v0.8B + umlal v16.8H, v5.8B, v1.8B + .ifc \type,avg + ld1 {v18.H}[0], [x0], x2 + ld1 {v18.H}[2], [x0] + sub x0, x0, x2 + .endif + rev64 v17.4S, v16.4S + add v16.8H, v16.8H, v17.8H + rshrn v16.8B, v16.8H, #6 + .ifc \type,avg + urhadd v16.8B, v16.8B, v18.8B + .endif + st1 {v16.H}[0], [x0], x2 + st1 {v16.H}[2], [x0], x2 + subs w3, w3, #2 + b.gt 1b + ret + +2: + ld1 {v16.H}[0], [x1], x2 + ld1 {v16.H}[1], [x1], x2 + .ifc \type,avg + ld1 {v18.H}[0], [x0], x2 + ld1 {v18.H}[1], [x0] + sub x0, x0, x2 + urhadd v16.8B, v16.8B, v18.8B + .endif + st1 {v16.H}[0], [x0], x2 + st1 {v16.H}[1], [x0], x2 + subs w3, w3, #2 + b.gt 2b + ret +endfunc +.endm + + h264_chroma_mc8 put + h264_chroma_mc8 avg + h264_chroma_mc4 put + h264_chroma_mc4 avg + h264_chroma_mc2 put + h264_chroma_mc2 avg + +#if CONFIG_RV40_DECODER +const rv40bias + .short 0, 16, 32, 16 + .short 32, 28, 32, 28 + .short 0, 32, 16, 32 + .short 32, 28, 32, 28 +endconst + + h264_chroma_mc8 put, rv40 + h264_chroma_mc8 avg, rv40 + h264_chroma_mc4 put, rv40 + h264_chroma_mc4 avg, rv40 +#endif + +#if CONFIG_VC1_DECODER + h264_chroma_mc8 put, vc1 + h264_chroma_mc8 avg, vc1 + h264_chroma_mc4 put, vc1 + h264_chroma_mc4 avg, vc1 +#endif diff --git a/libavcodec/aarch64/rv40dsp_init_aarch64.c b/libavcodec/aarch64/rv40dsp_init_aarch64.c new file mode 100644 index 0000000000..764bc1ef39 --- /dev/null +++ b/libavcodec/aarch64/rv40dsp_init_aarch64.c @@ -0,0 +1,48 @@ +/* + * 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 + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/aarch64/cpu.h" +#include "libavcodec/rv34dsp.h" + +#include "config.h" + +void ff_put_rv40_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h, + int x, int y); +void ff_put_rv40_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h, + int x, int y); + +void ff_avg_rv40_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h, + int x, int y); +void ff_avg_rv40_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h, + int x, int y); + +av_cold void ff_rv40dsp_init_aarch64(RV34DSPContext *c) +{ + int cpu_flags = av_get_cpu_flags(); + + if (have_neon(cpu_flags)) { + c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_neon; + c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_neon; + c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_neon; + c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_neon; + } +} diff --git a/libavcodec/aarch64/vc1dsp_init_aarch64.c b/libavcodec/aarch64/vc1dsp_init_aarch64.c new file mode 100644 index 0000000000..e59e55ec88 --- /dev/null +++ b/libavcodec/aarch64/vc1dsp_init_aarch64.c @@ -0,0 +1,47 @@ +/* + * 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 + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/aarch64/cpu.h" +#include "libavcodec/vc1dsp.h" + +#include "config.h" + +void ff_put_vc1_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h, + int x, int y); +void ff_avg_vc1_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h, + int x, int y); +void ff_put_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h, + int x, int y); +void ff_avg_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h, + int x, int y); + +av_cold void ff_vc1dsp_init_aarch64(VC1DSPContext *dsp) +{ + int cpu_flags = av_get_cpu_flags(); + + if (have_neon(cpu_flags)) { + dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = ff_put_vc1_chroma_mc8_neon; + dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_neon; + dsp->put_no_rnd_vc1_chroma_pixels_tab[1] = ff_put_vc1_chroma_mc4_neon; + dsp->avg_no_rnd_vc1_chroma_pixels_tab[1] = ff_avg_vc1_chroma_mc4_neon; + } +} diff --git a/libavcodec/h264chroma.c b/libavcodec/h264chroma.c index 5f8ed9193b..5b3e13bdac 100644 --- a/libavcodec/h264chroma.c +++ b/libavcodec/h264chroma.c @@ -46,6 +46,8 @@ av_cold void ff_h264chroma_init(H264ChromaContext *c, int bit_depth) SET_CHROMA(8); } + if (ARCH_AARCH64) + ff_h264chroma_init_aarch64(c, bit_depth); if (ARCH_ARM) ff_h264chroma_init_arm(c, bit_depth); if (ARCH_PPC) diff --git a/libavcodec/h264chroma.h b/libavcodec/h264chroma.h index 45bbc7d35e..d4b8a0eb0e 100644 --- a/libavcodec/h264chroma.h +++ b/libavcodec/h264chroma.h @@ -30,6 +30,7 @@ typedef struct H264ChromaContext { void ff_h264chroma_init(H264ChromaContext *c, int bit_depth); +void ff_h264chroma_init_aarch64(H264ChromaContext *c, int bit_depth); void ff_h264chroma_init_arm(H264ChromaContext *c, int bit_depth); void ff_h264chroma_init_ppc(H264ChromaContext *c, int bit_depth); void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth); diff --git a/libavcodec/rv34dsp.h b/libavcodec/rv34dsp.h index 7e28b26147..75f9ff8e66 100644 --- a/libavcodec/rv34dsp.h +++ b/libavcodec/rv34dsp.h @@ -81,6 +81,7 @@ void ff_rv40dsp_init(RV34DSPContext *c); void ff_rv34dsp_init_arm(RV34DSPContext *c); void ff_rv34dsp_init_x86(RV34DSPContext *c); +void ff_rv40dsp_init_aarch64(RV34DSPContext *c); void ff_rv40dsp_init_x86(RV34DSPContext *c); void ff_rv40dsp_init_arm(RV34DSPContext *c); diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c index bdd9a3e3e6..62dd5b57b8 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -619,6 +619,8 @@ av_cold void ff_rv40dsp_init(RV34DSPContext *c) c->rv40_loop_filter_strength[0] = rv40_h_loop_filter_strength; c->rv40_loop_filter_strength[1] = rv40_v_loop_filter_strength; + if (ARCH_AARCH64) + ff_rv40dsp_init_aarch64(c); if (ARCH_ARM) ff_rv40dsp_init_arm(c); if (ARCH_X86) diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c index 3b352d6d83..ec9c17b198 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -947,6 +947,8 @@ av_cold void ff_vc1dsp_init(VC1DSPContext *dsp) dsp->sprite_v_double_twoscale = sprite_v_double_twoscale_c; #endif /* CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER */ + if (ARCH_AARCH64) + ff_vc1dsp_init_aarch64(dsp); if (ARCH_ARM) ff_vc1dsp_init_arm(dsp); if (ARCH_PPC) diff --git a/libavcodec/vc1dsp.h b/libavcodec/vc1dsp.h index 018d298535..990fbc3303 100644 --- a/libavcodec/vc1dsp.h +++ b/libavcodec/vc1dsp.h @@ -77,6 +77,7 @@ typedef struct VC1DSPContext { } VC1DSPContext; void ff_vc1dsp_init(VC1DSPContext* c); +void ff_vc1dsp_init_aarch64(VC1DSPContext* dsp); void ff_vc1dsp_init_arm(VC1DSPContext* dsp); void ff_vc1dsp_init_ppc(VC1DSPContext *c); void ff_vc1dsp_init_x86(VC1DSPContext* dsp);