---
libavutil/aes.c | 4 ++
libavutil/aes_internal.h | 2 +
libavutil/x86/Makefile | 4 +-
libavutil/x86/aes.asm| 98
libavutil/x86/aes_init.c | 37 ++
5 files changed, 144 insertions(+), 1 deletion(-)
create mode 100644 libavutil/x86/aes.asm
create mode 100644 libavutil/x86/aes_init.c
diff --git a/libavutil/aes.c b/libavutil/aes.c
index 1fac4e8..672d0eb 100644
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -161,6 +161,8 @@ static void aes_decrypt(AVAES *a, uint8_t *dst, const
uint8_t *src,
void av_aes_crypt(AVAES *a, uint8_t *dst, const uint8_t *src,
int count, uint8_t *iv, int decrypt)
{
+if (count <= 0)
+return;
a->crypt(a, dst, src, count, iv, a->rounds);
}
@@ -200,6 +202,8 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits,
int decrypt)
uint8_t alog8[512];
a->crypt = decrypt ? aes_decrypt : aes_encrypt;
+if (ARCH_X86)
+ff_init_aes_x86(a, decrypt);
if
(!enc_multbl[FF_ARRAY_ELEMS(enc_multbl)-1][FF_ARRAY_ELEMS(enc_multbl[0])-1]) {
j = 1;
diff --git a/libavutil/aes_internal.h b/libavutil/aes_internal.h
index 4944258..dfa2039 100644
--- a/libavutil/aes_internal.h
+++ b/libavutil/aes_internal.h
@@ -40,4 +40,6 @@ typedef struct AVAES {
void (*crypt)(struct AVAES *a, uint8_t *dst, const uint8_t *src, int
count, uint8_t *iv, int rounds);
} AVAES;
+void ff_init_aes_x86(AVAES *a, int decrypt);
+
#endif /* AVUTIL_AES_INTERNAL_H */
diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile
index eb70a62..4ac6219 100644
--- a/libavutil/x86/Makefile
+++ b/libavutil/x86/Makefile
@@ -1,4 +1,5 @@
-OBJS += x86/cpu.o \
+OBJS += x86/aes_init.o \
+x86/cpu.o \
x86/float_dsp_init.o\
x86/lls_init.o \
@@ -10,5 +11,6 @@ YASM-OBJS += x86/cpuid.o
\
$(EMMS_OBJS__yes_) \
x86/float_dsp.o\
x86/lls.o \
+ x86/aes.o \
YASM-OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils.o \
diff --git a/libavutil/x86/aes.asm b/libavutil/x86/aes.asm
new file mode 100644
index 000..f56068a
--- /dev/null
+++ b/libavutil/x86/aes.asm
@@ -0,0 +1,98 @@
+;*
+;* Copyright (c) 2015 Rodger Combs
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* FFmpeg is distributed in the hope that it will be useful,
+;* but WITHOUT ANY WARRANTY; without even the implied warranty of
+;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with FFmpeg; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;**
+
+%include "x86util.asm"
+
+SECTION .text
+
+;-
+; void ff_aes_decrypt(AVAES *a, uint8_t *dst, const uint8_t *src,
+; int count, uint8_t *iv, int rounds)
+;-
+%macro AES_CRYPT 1
+%if %1 == 1
+%define CRYPT aesdec
+%define LAST aesdeclast
+cglobal aes_decrypt, 6,6,2
+%else
+%define CRYPT aesenc
+%define LAST aesenclast
+cglobal aes_encrypt, 6,6,2
+%endif
+pxor xm1, xm1
+shl r5d, 4
+sub r5, 0x60
+test r4, r4
+je .block
+movdqu xm1, [r4] ; iv
+.block:
+movdqu xm0, [r2] ; state
+%if %1 == 0
+pxor xm0, xm1
+%endif
+pxor xm0, [r0 + r5 + 0x60]
+CRYPT xm0, [r0 + r5 + 0x50]
+CRYPT xm0, [r0 + r5 + 0x40]
+CRYPT xm0, [r0 + r5 + 0x30]
+CRYPT xm0, [r0 + r5 + 0x20]
+CRYPT xm0, [r0 + r5 + 0x10]
+CRYPT xm0, [r0 + r5 + 0x00]
+CRYPT xm0, [r0 + r5 - 0x10]
+CRYPT xm0, [r0 + r5 - 0x20]
+CRYPT xm0, [r0 + r5 - 0x30]
+cmp r5, 0x60
+jl .last
+CRYPT xm0, [r0 + r5 - 0x40]
+CRYPT xm0, [r0 + r5 - 0x50]
+cmp r5, 0x80
+jl .last
+CRYPT xm0, [r0 + 0x20]
+CRYPT xm0, [r0 + 0x10]
+.last:
+LAST xm0, [r0]
+test r4, r4
+je .noiv
+%if %1 == 1
+px
