diff options
| author | James Almer <jamrial@gmail.com> | 2019-03-14 16:01:39 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-03-14 16:05:52 -0300 |
| commit | a2ae381b5a6f50669bcbd37001c110567a61f446 (patch) | |
| tree | a3fe4487584a735791f102b6c24ddd9e9c351e34 /libavcodec | |
| parent | ecb5546e97c479378e057f527cc1d79a46c31cb1 (diff) | |
| parent | 0801853e640624537db386727b36fa97aa6258e7 (diff) | |
| download | ffmpeg-a2ae381b5a6f50669bcbd37001c110567a61f446.tar.gz | |
Merge commit '0801853e640624537db386727b36fa97aa6258e7'
* commit '0801853e640624537db386727b36fa97aa6258e7':
libavcodec: vp8 neon optimizations for aarch64
See 833fed5253617924c41132e0ab261c1d8c076360
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aarch64/vp8dsp_init_aarch64.c | 6 | ||||
| -rw-r--r-- | libavcodec/vp8dsp.c | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/aarch64/vp8dsp_init_aarch64.c b/libavcodec/aarch64/vp8dsp_init_aarch64.c index dbc07408a0..6cf2c65470 100644 --- a/libavcodec/aarch64/vp8dsp_init_aarch64.c +++ b/libavcodec/aarch64/vp8dsp_init_aarch64.c @@ -37,9 +37,8 @@ VP8_EPEL(8, neon); av_cold void ff_vp78dsp_init_aarch64(VP8DSPContext *dsp) { - if (!have_neon(av_get_cpu_flags())) { + if (!have_neon(av_get_cpu_flags())) return; - } dsp->put_vp8_epel_pixels_tab[0][0][0] = ff_put_vp8_pixels16_neon; dsp->put_vp8_epel_pixels_tab[0][0][2] = ff_put_vp8_epel16_h6_neon; dsp->put_vp8_epel_pixels_tab[0][2][0] = ff_put_vp8_epel16_v6_neon; @@ -54,9 +53,8 @@ av_cold void ff_vp78dsp_init_aarch64(VP8DSPContext *dsp) av_cold void ff_vp8dsp_init_aarch64(VP8DSPContext *dsp) { - if (!have_neon(av_get_cpu_flags())) { + if (!have_neon(av_get_cpu_flags())) return; - } dsp->vp8_idct_add = ff_vp8_idct_add_neon; dsp->vp8_idct_dc_add = ff_vp8_idct_dc_add_neon; diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c index 30452bf5f8..4ff63d0784 100644 --- a/libavcodec/vp8dsp.c +++ b/libavcodec/vp8dsp.c @@ -673,14 +673,14 @@ av_cold void ff_vp78dsp_init(VP8DSPContext *dsp) VP78_BILINEAR_MC_FUNC(1, 8); VP78_BILINEAR_MC_FUNC(2, 4); + if (ARCH_AARCH64) + ff_vp78dsp_init_aarch64(dsp); if (ARCH_ARM) ff_vp78dsp_init_arm(dsp); if (ARCH_PPC) ff_vp78dsp_init_ppc(dsp); if (ARCH_X86) ff_vp78dsp_init_x86(dsp); - if (ARCH_AARCH64) - ff_vp78dsp_init_aarch64(dsp); } #if CONFIG_VP7_DECODER @@ -735,13 +735,13 @@ av_cold void ff_vp8dsp_init(VP8DSPContext *dsp) dsp->vp8_v_loop_filter_simple = vp8_v_loop_filter_simple_c; dsp->vp8_h_loop_filter_simple = vp8_h_loop_filter_simple_c; + if (ARCH_AARCH64) + ff_vp8dsp_init_aarch64(dsp); if (ARCH_ARM) ff_vp8dsp_init_arm(dsp); if (ARCH_X86) ff_vp8dsp_init_x86(dsp); if (ARCH_MIPS) ff_vp8dsp_init_mips(dsp); - if (ARCH_AARCH64) - ff_vp8dsp_init_aarch64(dsp); } #endif /* CONFIG_VP8_DECODER */ |