Changeset 4795:cf3e4ecde1f5 in roaraudio

Timestamp:

03/14/11 15:47:34 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added Adler32 support (Closes: #123) (pr1)

Files:

• ChangeLog (modified) (1 diff)
• doc/new-cmds (modified) (1 diff)
• include/libroar/crc.h (modified) (1 diff)
• include/libroar/hash.h (modified) (1 diff)
• libroar/crc.c (modified) (3 diffs)
• libroar/hash.c (modified) (3 diffs)

ChangeLog

@@ -15 +15 @@
         * Moved error string lookup from VS into error.c (pr1)
         * Added Meta Data types COMPOSER, RIGHTS, ISRC, LANGUAGE, GTIN, PUBLISHER (pr1)
+        * Added Adler32 support (Closes: #123) (pr1)
 
 v. 0.4beta3 - Wed Jan 26 2011 23:26 CET

doc/new-cmds

@@ -219 +219 @@
   +HT_ISBN10     = 72003
   +HT_ISBN13     = HT_GTIN13 #(ISBN-13 and GTIN/EAN-13 are the same)
+  +HT_ADLER32    = 73001 #(RFC1950)
   +HF_NONE       =  0 #(This entry does not have anything to do with the object...)
   +HF_OBJECT     =  1 #(This is an entry for exacltly this object)

include/libroar/crc.h

@@ -42 +42 @@
 #define roar_crc24_init() roar_crc24_add(0, NULL, 0)
 
+uint32_t roar_adler32_add(uint32_t state, const void * data, size_t len);
+#define roar_adler32_init() roar_adler32_add(0, NULL, 0)
+
 int roar_hash_crc24_init(void * state);
 int roar_hash_crc24_digest(void * state, void * digest, size_t * len);
 int roar_hash_crc24_proc(void * state, const void * data, size_t len);
 
+int roar_hash_adler32_init(void * state);
+int roar_hash_adler32_digest(void * state, void * digest, size_t * len);
+int roar_hash_adler32_proc(void * state, const void * data, size_t len);
+
 #endif
 

include/libroar/hash.h

@@ -75 +75 @@
 #define ROAR_HT_ISBN10      72003
 #define ROAR_HT_ISBN13      ROAR_HT_GTIN13
+#define ROAR_HT_ADLER32     73001
 
 struct roar_hash_cmds {

libroar/crc.c

@@ -39 +39 @@
 #define CRC24_INIT 0x00B704CEL
 
+#define ADLER32_BASE 65521L
+#define ADLER32_INIT 1L
+
 uint32_t roar_crc24_add(uint32_t state, const void * data, size_t len) {
  const unsigned char * p = data;
@@ -57 +60 @@
  return state & 0x00FFFFFFL;
 }
+
+uint32_t roar_adler32_add(uint32_t state, const void * data, size_t len) {
+ const unsigned char * p = data;
+ uint32_t s1 =  state        & 0xFFFFL;
+ uint32_t s2 = (state >> 16) & 0xFFFFL;
+ size_t n;
+
+ if ( data == NULL )
+  return ADLER32_INIT;
+
+ for (n = 0; n < len; n++) {
+  s1 = (s1 + p[n]) % ADLER32_BASE;
+  s2 = (s2 + s1  ) % ADLER32_BASE;
+ }
+
+ return (s2 << 16) + s1;
+}
+
 
 int roar_hash_crc24_init(void * state) {
@@ -93 +114 @@
 }
 
+
+int roar_hash_adler32_init(void * state) {
+ uint32_t * self = state;
+
+ *self = roar_adler32_init();
+
+ return 0;
+}
+
+int roar_hash_adler32_digest(void * state, void * digest, size_t * len) {
+ uint32_t * self = state;
+ unsigned char * out  = digest;
+ register uint32_t crc;
+
+ if ( *len < 4 )
+  return -1;
+
+ *len = 4;
+
+ crc = *self;
+
+ out[0] = ((crc & 0xFF000000) >> 24) & 0xFF;
+ out[1] = ((crc & 0x00FF0000) >> 16) & 0xFF;
+ out[2] = ((crc & 0x0000FF00) >>  8) & 0xFF;
+ out[3] = ((crc & 0x000000FF) >>  0) & 0xFF;
+
+ return 0;
+}
+
+int roar_hash_adler32_proc(void * state, const void * data, size_t len) {
+ uint32_t * self = state;
+
+ *self = roar_adler32_add(*self, data, len);
+
+ return 0;
+}
+
 //ll

libroar/hash.c

@@ -46 +46 @@
 
 static const struct hashes {
- const int     id;
- const char *  name;
- const ssize_t dlen;
+ const uint_least32_t id;
+ const char         * name;
+ const ssize_t        dlen;
 } _libroar_hashes[] = {
 /*
@@ -88 +88 @@
  {ROAR_HT_ISBN10,      "ISBN10",      8   },
  {ROAR_HT_ISBN13,      "ISBN13",      8   },
+ {ROAR_HT_ADLER32,     "ADLER32",     4   },
  {-1, NULL}
 };
@@ -102 +103 @@
   roar_hash_crc24_digest, NULL, roar_hash_crc24_proc
  },
+ {ROAR_HT_ADLER32, sizeof(uint32_t), -1,
+  roar_hash_adler32_init, NULL,
+  roar_hash_adler32_digest, NULL, roar_hash_adler32_proc
+ },
  {-1, -1, -1, NULL, NULL, NULL, NULL, NULL}
 };