[SCM] libav/experimental: dont memcpy() simpler and same speed

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:57:45 UTC 2013


The following commit has been merged in the experimental branch:
commit 15b6cae245d110e91d465493276eabdc05e39cb0
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Mar 13 10:45:41 2007 +0000

    dont memcpy() simpler and same speed
    
    Originally committed as revision 8377 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/sha1.c b/libavutil/sha1.c
index 27fe805..a8e2bd2 100644
--- a/libavutil/sha1.c
+++ b/libavutil/sha1.c
@@ -14,7 +14,7 @@ typedef struct AVSHA1 {
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
 
 /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define blk0(i) (block[i] = be2me_32(block[i]))
+#define blk0(i) (block[i] = be2me_32(((uint32_t*)buffer)[i]))
 #define blk(i) (block[i] = rol(block[i-3]^block[i-8]^block[i-14]^block[i-16],1))
 
 #define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)    +blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
@@ -32,8 +32,6 @@ static void transform(uint32_t state[5], uint8_t buffer[64]){
     unsigned int i;
     unsigned int a, b, c, d, e;
 
-    memcpy(block, buffer, 64);
-
     a = state[0];
     b = state[1];
     c = state[2];

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list