summaryrefslogtreecommitdiff
path: root/libavutil/camellia.c
diff options
context:
space:
mode:
authorSupraja Meedinti <supraja0493@gmail.com>2015-02-10 21:24:07 +0530
committerMichael Niedermayer <michaelni@gmx.at>2015-02-10 17:15:36 +0100
commit8d5a8501195283e6f09f0d0b929cf2e893194df7 (patch)
treefc0b052c5e3becdd8d8889a450a4db1760b14b4c /libavutil/camellia.c
parent7fc33dca395c4b9c089f6a5f9aaba1133a5452a2 (diff)
downloadffmpeg-8d5a8501195283e6f09f0d0b929cf2e893194df7.tar.gz
libavutil: camellia: remove unwanted memory loads
lavu CAMELLIA size: 1048576 runs: 1024 time: 21.549 +- 0.17 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/camellia.c')
-rw-r--r--libavutil/camellia.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavutil/camellia.c b/libavutil/camellia.c
index 62ee96b695..483eed22f0 100644
--- a/libavutil/camellia.c
+++ b/libavutil/camellia.c
@@ -142,11 +142,9 @@ static void LR128(uint64_t d[2], const uint64_t K[2], int x)
static uint64_t F(uint64_t F_IN, uint64_t KE)
{
- uint8_t y[8];
KE ^= F_IN;
- AV_WB64(y,KE);
- KE=SP[0][y[0]] ^ SP[1][y[1]] ^ SP[2][y[2]] ^ SP[3][y[3]] ^ SP[4][y[4]] ^ SP[5][y[5]] ^ SP[6][y[6]] ^ SP[7][y[7]];
- return KE;
+ F_IN=SP[0][KE >> 56]^SP[1][(KE >> 48) & MASK8]^SP[2][(KE >> 40) & MASK8]^SP[3][(KE >> 32) & MASK8]^SP[4][(KE >> 24) & MASK8]^SP[5][(KE >> 16) & MASK8]^SP[6][(KE >> 8) & MASK8]^SP[7][KE & MASK8];
+ return F_IN;
}
static uint64_t FL(uint64_t FL_IN, uint64_t KE)