diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-04-05 10:16:32 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-04-05 12:00:36 +0200 |
| commit | 040598218f48274a6780ab9059faedbb3db77cb5 (patch) | |
| tree | 725db663d71925400ca8d99c7e4e652383331788 /libswscale/aarch64 | |
| parent | 56a3a3f01ca5dd4e894729a4e4561601aa0f605c (diff) | |
sws/aarch64: restore ff_hscale_8_to_15_neon()
Fix final scaling and required filter alignment. Pass FATE.
Diffstat (limited to 'libswscale/aarch64')
| -rw-r--r-- | libswscale/aarch64/hscale.S | 2 | ||||
| -rw-r--r-- | libswscale/aarch64/swscale.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/aarch64/hscale.S b/libswscale/aarch64/hscale.S index c32394c9e6..cc78c1901d 100644 --- a/libswscale/aarch64/hscale.S +++ b/libswscale/aarch64/hscale.S @@ -51,7 +51,7 @@ function ff_hscale_8_to_15_neon, export=1 add x10, x10, w6, UXTW #1 // filter2 += filterSize*2 addp v4.4S, v4.4S, v5.4S // horizontal pair adding of the 8x32-bit sums into 4x32-bit addp v4.4S, v4.4S, v4.4S // horizontal pair adding of the 4x32-bit sums into 2x32-bit - sqrshrun v4.4H, v4.4S, #7 // shift and clip the 2x16-bit final values + sqshrn v4.4H, v4.4S, #7 // shift and clip the 2x16-bit final values st1 {v4.S}[0], [x1], #4 // write to destination subs w2, w2, #2 // dstW -= 2 b.gt 1b // loop until end of line diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index ebf76a5540..6b9b046816 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -31,7 +31,7 @@ av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) if (have_neon(cpu_flags)) { if (c->srcBpc == 8 && c->dstBpc <= 14) { - //c->hyScale = c->hcScale = ff_hscale_8_to_15_neon; + c->hyScale = c->hcScale = ff_hscale_8_to_15_neon; } } } |