[FFmpeg-cvslog] Revert "avcodec/arm/hevc: remove duplicate mov of deblock neon"

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Mar 23 09:38:50 2023 +0200| [30cea1d39b94716f2e24f6d5b07e5bc686fdbaf6] | committer: Martin Storsjö

Revert "avcodec/arm/hevc: remove duplicate mov of deblock neon"

This reverts commit 9413bdc381112711a7beb6d6b8d8fc4b4ff6ca01.

That commit broke the fate HEVC tests - unfortunately I only
tested checkasm for that patch, and that function is still
lacking checkasm coverage.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30cea1d39b94716f2e24f6d5b07e5bc686fdbaf6
---

 libavcodec/arm/hevcdsp_deblock_neon.S | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/arm/hevcdsp_deblock_neon.S b/libavcodec/arm/hevcdsp_deblock_neon.S
index ebcd056430..7cb7487ef6 100644
--- a/libavcodec/arm/hevcdsp_deblock_neon.S
+++ b/libavcodec/arm/hevcdsp_deblock_neon.S
@@ -107,6 +107,7 @@
         vshl.s16   q5, q5, #1
         vcgt.s16   q3, q0, q4
 
+        vmovn.i16  d6, q3
         vshr.s16   q1, q0, #2
         vmovn.i16  d6, q3
         vcgt.s16   q5, q1, q5
@@ -145,6 +146,7 @@
         vtrn.32    q2, q5
         vand       q5, q2
         vneg.s16   q6, q7
+        vmovn.i16  d4, q5
         vmovn.i16  d4, q2
         vmov       r8, s8