Changeset 2511 for pjproject

Timestamp:

Mar 13, 2009 12:28:00 PM (16 years ago)

Author:

bennylp

Message:

Ticket #751: Incorrect table based CRC32 calculation on big endian platforms (thanks Ruud Klaver for the fix)

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/crc32.c (modified) (3 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/crc32.c

@@ -23 +23 @@
 #define CRC32_INDEX(c)      (c & 0xff)
 #define CRC32_SHIFTED(c)    (c >> 8)
+#define CRC32_SWAP(c)       (c)
 
 static const pj_uint32_t crc_tab[] = {
@@ -83 +84 @@
 #define CRC32_INDEX(c)      (c >> 24)
 #define CRC32_SHIFTED(c)    (c << 8)
+#define CRC32_SWAP(c)       ((((c) & 0xff000000) >> 24) | \
+                             (((c) & 0x00ff0000) >>  8) | \
+                             (((c) & 0x0000ff00) <<  8) | \
+                             (((c) & 0x000000ff) << 24))
 
 static const pj_uint32_t crc_tab[] = {
@@ -180 +185 @@
 PJ_DEF(pj_uint32_t) pj_crc32_final(pj_crc32_context *ctx)
 {
-    return ctx->crc_state;
+    return CRC32_SWAP(ctx->crc_state);
 }