X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fadler32.c;h=7f5afdbc40450fb8a86a7c089b8259ba6f477c95;hb=3893feeccdf754057fc7c7ac711ae876733f2f33;hp=a4c3810e05deafff899032cae851b5fa178d180e;hpb=bfe3676feb5548993292b806de45a1cbc746c05f;p=ffmpeg

diff --git a/libavutil/adler32.c b/libavutil/adler32.c
index a4c3810e05d..7f5afdbc404 100644
--- a/libavutil/adler32.c
+++ b/libavutil/adler32.c
@@ -21,29 +21,33 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include "common.h"
+#include "config.h"
 #include "adler32.h"
 
 #define BASE 65521L /* largest prime smaller than 65536 */
 
-#define DO1(buf)  {s1 += *buf++; s2 += s1;}
+#define DO1(buf)  { s1 += *buf++; s2 += s1; }
 #define DO4(buf)  DO1(buf); DO1(buf); DO1(buf); DO1(buf);
 #define DO16(buf) DO4(buf); DO4(buf); DO4(buf); DO4(buf);
 
-unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigned int len)
+unsigned long av_adler32_update(unsigned long adler, const uint8_t * buf,
+                                unsigned int len)
 {
     unsigned long s1 = adler & 0xffff;
     unsigned long s2 = adler >> 16;
 
-    while (len>0) {
+    while (len > 0) {
 #if CONFIG_SMALL
-        while(len>4 && s2 < (1U<<31)){
-            DO4(buf); len-=4;
+        while (len > 4  && s2 < (1U << 31)) {
+            DO4(buf);
+            len -= 4;
+        }
 #else
-        while(len>16 && s2 < (1U<<31)){
-            DO16(buf); len-=16;
-#endif
+        while (len > 16 && s2 < (1U << 31)) {
+            DO16(buf);
+            len -= 16;
         }
+#endif
         DO1(buf); len--;
         s1 %= BASE;
         s2 %= BASE;
@@ -52,21 +56,34 @@ unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigne
 }
 
 #ifdef TEST
+#include <string.h>
 #include "log.h"
+#include "timer.h"
 #define LEN 7001
-volatile int checksum;
-int main(void){
+
+static volatile int checksum;
+
+int main(int argc, char **argv)
+{
     int i;
     char data[LEN];
-    av_log_level = AV_LOG_DEBUG;
-    for(i=0; i<LEN; i++)
-        data[i]= ((i*i)>>3) + 123*i;
-    for(i=0; i<1000; i++){
-        START_TIMER
-        checksum= av_adler32_update(1, data, LEN);
-        STOP_TIMER("adler")
+
+    av_log_set_level(AV_LOG_DEBUG);
+
+    for (i = 0; i < LEN; i++)
+        data[i] = ((i * i) >> 3) + 123 * i;
+
+    if (argc > 1 && !strcmp(argv[1], "-t")) {
+        for (i = 0; i < 1000; i++) {
+            START_TIMER;
+            checksum = av_adler32_update(1, data, LEN);
+            STOP_TIMER("adler");
+        }
+    } else {
+        checksum = av_adler32_update(1, data, LEN);
     }
-    av_log(NULL, AV_LOG_DEBUG, "%X == 50E6E508\n", checksum);
-    return 0;
+
+    av_log(NULL, AV_LOG_DEBUG, "%X (expected 50E6E508)\n", checksum);
+    return checksum == 0x50e6e508 ? 0 : 1;
 }
 #endif