diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 23:03:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 23:20:31 +0200 |
| commit | 70b8668fb532a7efd2953822872285d1e9947375 (patch) | |
| tree | d825e443c7ae53ad570d577e87818d2816d10940 /libavutil/x86 | |
| parent | 5e1832c29c2da50db7c82ec6cbf0bc98892230b7 (diff) | |
drop LLS1, rename LLS2 to LLS
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86')
| -rw-r--r-- | libavutil/x86/lls.asm | 8 | ||||
| -rw-r--r-- | libavutil/x86/lls_init.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm index c2aead38ef..769befb769 100644 --- a/libavutil/x86/lls.asm +++ b/libavutil/x86/lls.asm @@ -29,7 +29,7 @@ SECTION .text %define COVAR_STRIDE MAX_VARS_ALIGN*8 %define COVAR(x,y) [covarq + (x)*8 + (y)*COVAR_STRIDE] -struc LLSModel2 +struc LLSModel .covariance: resq MAX_VARS_ALIGN*MAX_VARS_ALIGN .coeff: resq MAX_VARS*MAX_VARS .variance: resq MAX_VARS @@ -49,7 +49,7 @@ INIT_XMM sse2 %define movdqa movaps cglobal update_lls, 2,5,8, ctx, var, i, j, covar2 %define covarq ctxq - mov id, [ctxq + LLSModel2.indep_count] + mov id, [ctxq + LLSModel.indep_count] lea varq, [varq + iq*8] neg iq mov covar2q, covarq @@ -129,7 +129,7 @@ cglobal update_lls, 2,5,8, ctx, var, i, j, covar2 INIT_YMM avx cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2 %define covarq ctxq - mov countd, [ctxq + LLSModel2.indep_count] + mov countd, [ctxq + LLSModel.indep_count] lea count2d, [countq-2] xor id, id .loopi: @@ -206,7 +206,7 @@ cglobal evaluate_lls, 3,4,2, ctx, var, order, i %define coefsq ctxq mov id, orderd imul orderd, MAX_VARS - lea coefsq, [ctxq + LLSModel2.coeff + orderq*8] + lea coefsq, [ctxq + LLSModel.coeff + orderq*8] movsd m0, [varq] movhpd m0, [varq + 8] mulpd m0, [coefsq] diff --git a/libavutil/x86/lls_init.c b/libavutil/x86/lls_init.c index bf999d5fc3..181ca38dae 100644 --- a/libavutil/x86/lls_init.c +++ b/libavutil/x86/lls_init.c @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/lls2.h" +#include "libavutil/lls.h" #include "libavutil/x86/cpu.h" -void ff_update_lls_sse2(LLSModel2 *m, double *var); -void ff_update_lls_avx(LLSModel2 *m, double *var); -double ff_evaluate_lls_sse2(LLSModel2 *m, double *var, int order); +void ff_update_lls_sse2(LLSModel *m, double *var); +void ff_update_lls_avx(LLSModel *m, double *var); +double ff_evaluate_lls_sse2(LLSModel *m, double *var, int order); -av_cold void ff_init_lls_x86(LLSModel2 *m) +av_cold void ff_init_lls_x86(LLSModel *m) { int cpu_flags = av_get_cpu_flags(); if (EXTERNAL_SSE2(cpu_flags)) { |