X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Farm%2Fpixblockdsp_init_arm.c;h=5481c0178c03e74d3b4a5612c92ed399fb697c38;hb=283f950a65b187c5a38d1c0322b821812c5d8861;hp=59d2b493816eeb551c35f0c0013e67eab27da705;hpb=a12063b118ad05409ff775ba30fab00265ad3031;p=ffmpeg

diff --git a/libavcodec/arm/pixblockdsp_init_arm.c b/libavcodec/arm/pixblockdsp_init_arm.c
index 59d2b493816..5481c0178c0 100644
--- a/libavcodec/arm/pixblockdsp_init_arm.c
+++ b/libavcodec/arm/pixblockdsp_init_arm.c
@@ -29,6 +29,15 @@ void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels,
 void ff_diff_pixels_armv6(int16_t *block, const uint8_t *s1,
                           const uint8_t *s2, ptrdiff_t stride);
 
+void ff_get_pixels_neon(int16_t *block, const uint8_t *pixels,
+                        ptrdiff_t stride);
+void ff_get_pixels_unaligned_neon(int16_t *block, const uint8_t *pixels,
+                                  ptrdiff_t stride);
+void ff_diff_pixels_neon(int16_t *block, const uint8_t *s1,
+                         const uint8_t *s2, ptrdiff_t stride);
+void ff_diff_pixels_unaligned_neon(int16_t *block, const uint8_t *s1,
+                                   const uint8_t *s2, ptrdiff_t stride);
+
 av_cold void ff_pixblockdsp_init_arm(PixblockDSPContext *c,
                                      AVCodecContext *avctx,
                                      unsigned high_bit_depth)
@@ -40,4 +49,13 @@ av_cold void ff_pixblockdsp_init_arm(PixblockDSPContext *c,
             c->get_pixels = ff_get_pixels_armv6;
         c->diff_pixels = ff_diff_pixels_armv6;
     }
+
+    if (have_neon(cpu_flags)) {
+        if (!high_bit_depth) {
+            c->get_pixels_unaligned = ff_get_pixels_unaligned_neon;
+            c->get_pixels = ff_get_pixels_neon;
+        }
+        c->diff_pixels_unaligned = ff_diff_pixels_unaligned_neon;
+        c->diff_pixels = ff_diff_pixels_neon;
+    }
 }