summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2014-12-19 22:09:30 -0500
committerRonald S. Bultje <rsbultje@gmail.com>2014-12-27 16:55:11 -0500
commit8132629bd5875e6993a8b810f12c7dec00844944 (patch)
tree31d882d26f93266db318a5f581b635f61f5380db
parentc013ca58c5349e34610e94336d0fae6ef7a403a0 (diff)
vp9/x86: make cglobal statement more conservative in register allocation.
-rw-r--r--libavcodec/x86/vp9lpf.asm21
1 files changed, 16 insertions, 5 deletions
diff --git a/libavcodec/x86/vp9lpf.asm b/libavcodec/x86/vp9lpf.asm
index e0f7386a08..c62ac462b0 100644
--- a/libavcodec/x86/vp9lpf.asm
+++ b/libavcodec/x86/vp9lpf.asm
@@ -307,7 +307,20 @@ SECTION .text
%endif
%endmacro
-%macro LOOPFILTER 2 ; %1=v/h %2=size1
+%macro LOOPFILTER 3 ; %1=v/h %2=size1 %3=stack
+%if UNIX64
+cglobal vp9_loop_filter_%1_%2_16, 5, 9, 16, %3, dst, stride, E, I, H, mstride, dst2, stride3, mstride3
+%else
+%if WIN64
+cglobal vp9_loop_filter_%1_%2_16, 4, 8, 16, %3, dst, stride, E, I, mstride, dst2, stride3, mstride3
+%else
+cglobal vp9_loop_filter_%1_%2_16, 2, 6, 16, %3, dst, stride, mstride, dst2, stride3, mstride3
+%define Ed dword r2m
+%define Id dword r3m
+%endif
+%define Hd dword r4m
+%endif
+
mov mstrideq, strideq
neg mstrideq
@@ -795,10 +808,8 @@ SECTION .text
%macro LPF_16_VH 2
INIT_XMM %2
-cglobal vp9_loop_filter_v_%1_16, 5,10,16, dst, stride, E, I, H, mstride, dst2, stride3, mstride3
- LOOPFILTER v, %1
-cglobal vp9_loop_filter_h_%1_16, 5,10,16, 256, dst, stride, E, I, H, mstride, dst2, stride3, mstride3
- LOOPFILTER h, %1
+LOOPFILTER v, %1, 0
+LOOPFILTER h, %1, 256
%endmacro
%macro LPF_16_VH_ALL_OPTS 1