har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/md5: move loop inside inner function

Browse Source 
AMD Athlon(tm) II X3 450 Processor

size: 1048576  runs: 1024  time:    5.660 +- 0.023
size: 1048576  runs: 1024  time:    5.661 +- 0.030
size: 1048576  runs: 1024  time:    5.656 +- 0.022
size: 1048576  runs: 1024  time:    5.647 +- 0.026

size: 1048576  runs: 1024  time:    5.428 +- 0.037
size: 1048576  runs: 1024  time:    5.426 +- 0.034
size: 1048576  runs: 1024  time:    5.426 +- 0.034
size: 1048576  runs: 1024  time:    5.428 +- 0.038

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Giorgio Vazzana 2013-05-20 21:43:07 +02:00 committed by Michael Niedermayer
parent 2211c76287
commit a67304d05f
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavutil/md5.c
View File

@ -92,14 +92,19 @@ static const uint32_t T[64] = { // T[i]= fabs(sin(i+1)<<32)
a = b + (a << t | a >> (32 - t)); \ a = b + (a << t | a >> (32 - t)); \
} while (0) } while (0)
static void body(uint32_t ABCD[4], uint32_t X[16]) static void body(uint32_t ABCD[4], uint32_t *src, int nblocks)
{ {
int i av_unused; int i av_unused;
uint32_t t; int n;
uint32_t a = ABCD[3]; uint32_t a, b, c, d, t, *X;
uint32_t b = ABCD[2];
uint32_t c = ABCD[1]; for (n = 0; n < nblocks; n++) {
uint32_t d = ABCD[0]; a = ABCD[3];
b = ABCD[2];
c = ABCD[1];
d = ABCD[0];
X = src + n * 16;
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
@ -127,6 +132,7 @@ static void body(uint32_t ABCD[4], uint32_t X[16])
ABCD[1] += c; ABCD[1] += c;
ABCD[2] += b; ABCD[2] += b;
ABCD[3] += a; ABCD[3] += a;
}
} }
void av_md5_init(AVMD5 *ctx) void av_md5_init(AVMD5 *ctx)
@ -154,21 +160,20 @@ void av_md5_update(AVMD5 *ctx, const uint8_t *src, int len)
len -= cnt; len -= cnt;
if (j + cnt < 64) if (j + cnt < 64)
return; return;
body(ctx->ABCD, (uint32_t *)ctx->block); body(ctx->ABCD, (uint32_t *)ctx->block, 1);
} }
end = src + (len & ~63); end = src + (len & ~63);
if (HAVE_BIGENDIAN || (!HAVE_FAST_UNALIGNED && ((intptr_t)src & 3))) { if (HAVE_BIGENDIAN || (!HAVE_FAST_UNALIGNED && ((intptr_t)src & 3))) {
while (src < end) { while (src < end) {
memcpy(ctx->block, src, 64); memcpy(ctx->block, src, 64);
body(ctx->ABCD, (uint32_t *) ctx->block); body(ctx->ABCD, (uint32_t *) ctx->block, 1);
src += 64; src += 64;
} }
} else { } else {
while (src < end) { int nblocks = len / 64;
body(ctx->ABCD, (uint32_t *)src); body(ctx->ABCD, (uint32_t *)src, nblocks);
src += 64; src = end;
}
} }
len &= 63; len &= 63;
if (len > 0) if (len > 0)