From 0a63448b86bfa2998f14055402896406a33de109 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 22 Jul 2018 15:21:05 +0800 Subject: [PATCH] Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31 --- README.md | 1 + trunk/src/core/srs_core.hpp | 2 +- trunk/src/kernel/srs_kernel_utility.cpp | 243 +++++++++++++----------- trunk/src/utest/srs_utest_kernel.cpp | 145 +++++++++++++- 4 files changed, 268 insertions(+), 123 deletions(-) diff --git a/README.md b/README.md index deabc0b74..7b7137216 100755 --- a/README.md +++ b/README.md @@ -184,6 +184,7 @@ Please select according to languages: ### V3 changes +* v3.0, 2018-07-22, Replace crc32 IEEE and MPEG by pycrc to match MIT license. 3.0.31 * v3.0, 2018-07-21, Replace crc32 IEEE by golang to match MIT license. 3.0.30 * v3.0, 2018-02-16, Fix [#464][bug #464], support RTMP origin cluster. 3.0.29 * v3.0, 2018-02-13, Fix [#1057][bug #1057], switch to simple handshake. 3.0.28 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 2db884d2b..48f3a7e30 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -27,7 +27,7 @@ // current release version #define VERSION_MAJOR 3 #define VERSION_MINOR 0 -#define VERSION_REVISION 30 +#define VERSION_REVISION 31 // generated by configure, only macros. #include diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp index 7c901eb2d..009c51bca 100644 --- a/trunk/src/kernel/srs_kernel_utility.cpp +++ b/trunk/src/kernel/srs_kernel_utility.cpp @@ -668,147 +668,166 @@ bool srs_aac_startswith_adts(SrsBuffer* stream) return true; } - -// @see http://www.stmc.edu.hk/~vincent/ffmpeg_0.4.9-pre1/libavformat/mpegtsenc.c -unsigned int __mpegts_crc32(const uint8_t *data, int len) + +// @see pycrc reflect at https://github.com/winlinvip/pycrc/blob/master/pycrc/algorithms.py#L107 +uint64_t __crc32_reflect(uint64_t data, int width) { - /* - * MPEG2 transport stream (aka DVB) mux - * Copyright (c) 2003 Fabrice Bellard. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - static const uint32_t table[256] = { - 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, - 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, - 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7, - 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, - 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, - 0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, - 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef, - 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, - 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, - 0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, - 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0, - 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, - 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4, - 0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, - 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, - 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, - 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc, - 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, - 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050, - 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, - 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, - 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, - 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1, - 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, - 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, - 0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, - 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9, - 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, - 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, - 0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, - 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71, - 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, - 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, - 0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, - 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, - 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, - 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a, - 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, - 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676, - 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, - 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, - 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, - 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4 - }; + uint64_t res = data & 0x01; - uint32_t crc = 0xffffffff; - - for (int i=0; i> 24) ^ *data++) & 0xff]; + for (int i = 0; i < width - 1; i++) { + data >>= 1; + res = (res << 1) | (data & 0x01); } - return crc; + return res; } - -uint32_t srs_crc32_mpegts(const void* buf, int size) -{ - return __mpegts_crc32((const uint8_t*)buf, size); -} - -// @see golang IEEE of hash/crc32/crc32.go -// IEEE is by far and away the most common CRC-32 polynomial. -// Used by ethernet (IEEE 802.3), v.42, fddi, gzip, zip, png, ... -static uint32_t __crc32_IEEE = 0xedb88320; - -// @see golang IEEE of hash/crc32/crc32.go -// Castagnoli's polynomial, used in iSCSI. -// Has better error detection characteristics than IEEE. -// http://dx.doi.org/10.1109/26.231911 -//static uint32_t __crc32_Castagnoli = 0x82f63b78; - -// @see golang IEEE of hash/crc32/crc32.go -// Koopman's polynomial. -// Also has better error detection characteristics than IEEE. -// http://dx.doi.org/10.1109/DSN.2002.1028931 -//static uint32_t __crc32_Koopman = 0xeb31d82e; -// @see golang makeTable of hash/crc32/crc32.go -void __crc32_make_table(uint32_t t[256], uint32_t poly) +// @see pycrc gen_table at https://github.com/winlinvip/pycrc/blob/master/pycrc/algorithms.py#L178 +void __crc32_make_table(uint32_t t[256], uint32_t poly, bool reflect_in) { - for (int i = 0; i < 256; i++) { - uint32_t crc = uint32_t(i); + int width = 32; // 32bits checksum. + uint64_t msb_mask = (uint32_t)(0x01 << (width - 1)); + uint64_t mask = (uint32_t)(((msb_mask - 1) << 1) | 1); + + int tbl_idx_width = 8; // table index size. + int tbl_width = 0x01 << tbl_idx_width; // table size: 256 + + for (int i = 0; i < tbl_width; i++) { + uint64_t reg = uint64_t(i); - for (int j = 0; j < 8; j++) { - if ((crc&1) == 1) { - crc = (crc >> 1) ^ poly; + if (reflect_in) { + reg = __crc32_reflect(reg, tbl_idx_width); + } + + reg = reg << (width - tbl_idx_width); + for (int j = 0; j < tbl_idx_width; j++) { + if ((reg&msb_mask) != 0) { + reg = (reg << 1) ^ poly; } else { - crc = crc >> 1; + reg = reg << 1; } } - t[i] = crc; + if (reflect_in) { + reg = __crc32_reflect(reg, width); + } + + t[i] = (uint32_t)(reg & mask); } } + +// @see pycrc table_driven at https://github.com/winlinvip/pycrc/blob/master/pycrc/algorithms.py#L207 +uint32_t __crc32_table_driven(uint32_t* t, const void* buf, int size, uint32_t previous, bool reflect_in, uint32_t xor_in, bool reflect_out, uint32_t xor_out) +{ + int width = 32; // 32bits checksum. + uint64_t msb_mask = (uint32_t)(0x01 << (width - 1)); + uint64_t mask = (uint32_t)(((msb_mask - 1) << 1) | 1); -// @see golang update of hash/crc32/crc32.go -uint32_t __crc32_update(uint32_t crc, uint32_t t[256], const uint8_t* buf, int size) { - crc = crc ^ 0xffffffff; + int tbl_idx_width = 8; // table index size. - for (int i = 0; i < size; i++) { - uint8_t v = (uint8_t)buf[i]; - crc = t[uint8_t(crc) ^ v] ^ (crc >> 8); + uint8_t* p = (uint8_t*)buf; + uint64_t reg = 0; + + if (!reflect_in) { + reg = xor_in; + + for (int i = 0; i < size; i++) { + uint8_t tblidx = (uint8_t)((reg >> (width - tbl_idx_width)) ^ p[i]); + reg = t[tblidx] ^ (reg << tbl_idx_width); + } + } else { + reg = previous ^ __crc32_reflect(xor_in, width); + + for (int i = 0; i < size; i++) { + uint8_t tblidx = (uint8_t)(reg ^ p[i]); + reg = t[tblidx] ^ (reg >> tbl_idx_width); + } + + reg = __crc32_reflect(reg, width); } - return crc ^ 0xffffffff; + if (reflect_out) { + reg = __crc32_reflect(reg, width); + } + + reg ^= xor_out; + return (uint32_t)(reg & mask); } -// @see golang IEEE of hash/crc32/crc32.go +// @see pycrc https://github.com/winlinvip/pycrc/blob/master/pycrc/algorithms.py#L207 // IEEETable is the table for the IEEE polynomial. static uint32_t __crc32_IEEE_table[256]; static bool __crc32_IEEE_table_initialized = false; +// @see pycrc https://github.com/winlinvip/pycrc/blob/master/pycrc/models.py#L220 +// crc32('123456789') = 0xcbf43926 +// where it's defined as model: +// 'name': 'crc-32', +// 'width': 32, +// 'poly': 0x4c11db7, +// 'reflect_in': True, +// 'xor_in': 0xffffffff, +// 'reflect_out': True, +// 'xor_out': 0xffffffff, +// 'check': 0xcbf43926, uint32_t srs_crc32_ieee(const void* buf, int size, uint32_t previous) { + // @see golang IEEE of hash/crc32/crc32.go + // IEEE is by far and away the most common CRC-32 polynomial. + // Used by ethernet (IEEE 802.3), v.42, fddi, gzip, zip, png, ... + // @remark The poly of CRC32 IEEE is 0x04C11DB7, its reverse is 0xEDB88320, + // please read https://en.wikipedia.org/wiki/Cyclic_redundancy_check + uint32_t poly = 0x04C11DB7; + + bool reflect_in = true; + uint32_t xor_in = 0xffffffff; + bool reflect_out = true; + uint32_t xor_out = 0xffffffff; + if (!__crc32_IEEE_table_initialized) { - __crc32_make_table(__crc32_IEEE_table, __crc32_IEEE); + __crc32_make_table(__crc32_IEEE_table, poly, reflect_in); __crc32_IEEE_table_initialized = true; } - return __crc32_update(previous, __crc32_IEEE_table, (uint8_t*)buf, size); + + return __crc32_table_driven(__crc32_IEEE_table, buf, size, previous, reflect_in, xor_in, reflect_out, xor_out); +} + +// @see pycrc https://github.com/winlinvip/pycrc/blob/master/pycrc/algorithms.py#L238 +// IEEETable is the table for the MPEG polynomial. +static uint32_t __crc32_MPEG_table[256]; +static bool __crc32_MPEG_table_initialized = false; + +// @see pycrc https://github.com/winlinvip/pycrc/blob/master/pycrc/models.py#L238 +// crc32('123456789') = 0x0376e6e7 +// where it's defined as model: +// 'name': 'crc-32', +// 'width': 32, +// 'poly': 0x4c11db7, +// 'reflect_in': False, +// 'xor_in': 0xffffffff, +// 'reflect_out': False, +// 'xor_out': 0x0, +// 'check': 0x0376e6e7, +uint32_t srs_crc32_mpegts(const void* buf, int size) +{ + // @see golang IEEE of hash/crc32/crc32.go + // IEEE is by far and away the most common CRC-32 polynomial. + // Used by ethernet (IEEE 802.3), v.42, fddi, gzip, zip, png, ... + // @remark The poly of CRC32 IEEE is 0x04C11DB7, its reverse is 0xEDB88320, + // please read https://en.wikipedia.org/wiki/Cyclic_redundancy_check + uint32_t poly = 0x04C11DB7; + + bool reflect_in = false; + uint32_t xor_in = 0xffffffff; + bool reflect_out = false; + uint32_t xor_out = 0x0; + + if (!__crc32_MPEG_table_initialized) { + __crc32_make_table(__crc32_MPEG_table, poly, reflect_in); + __crc32_MPEG_table_initialized = true; + } + + return __crc32_table_driven(__crc32_MPEG_table, buf, size, 0x00, reflect_in, xor_in, reflect_out, xor_out); } /* diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp index 6fd379695..5fafd417f 100644 --- a/trunk/src/utest/srs_utest_kernel.cpp +++ b/trunk/src/utest/srs_utest_kernel.cpp @@ -1523,7 +1523,139 @@ VOID TEST(KernelUtility, AvcUev) } } +extern void __crc32_make_table(uint32_t t[256], uint32_t poly, bool reflect_in); + +VOID TEST(KernelUtility, CRC32MakeTable) +{ + uint32_t t[256]; + + // IEEE, @see https://github.com/ossrs/srs/blob/608c88b8f2b352cdbce3b89b9042026ea907e2d3/trunk/src/kernel/srs_kernel_utility.cpp#L770 + __crc32_make_table(t, 0x4c11db7, true); + + EXPECT_EQ((uint32_t)0x00000000, t[0]); + EXPECT_EQ((uint32_t)0x77073096, t[1]); + EXPECT_EQ((uint32_t)0xEE0E612C, t[2]); + EXPECT_EQ((uint32_t)0x990951BA, t[3]); + EXPECT_EQ((uint32_t)0x076DC419, t[4]); + EXPECT_EQ((uint32_t)0x706AF48F, t[5]); + EXPECT_EQ((uint32_t)0xE963A535, t[6]); + EXPECT_EQ((uint32_t)0x9E6495A3, t[7]); + + EXPECT_EQ((uint32_t)0xB3667A2E, t[248]); + EXPECT_EQ((uint32_t)0xC4614AB8, t[249]); + EXPECT_EQ((uint32_t)0x5D681B02, t[250]); + EXPECT_EQ((uint32_t)0x2A6F2B94, t[251]); + EXPECT_EQ((uint32_t)0xB40BBE37, t[252]); + EXPECT_EQ((uint32_t)0xC30C8EA1, t[253]); + EXPECT_EQ((uint32_t)0x5A05DF1B, t[254]); + EXPECT_EQ((uint32_t)0x2D02EF8D, t[255]); + + // IEEE, @see https://github.com/ossrs/srs/blob/608c88b8f2b352cdbce3b89b9042026ea907e2d3/trunk/src/kernel/srs_kernel_utility.cpp#L770 + __crc32_make_table(t, 0x4c11db7, true); + + EXPECT_EQ((uint32_t)0x00000000, t[0]); + EXPECT_EQ((uint32_t)0x77073096, t[1]); + EXPECT_EQ((uint32_t)0xEE0E612C, t[2]); + EXPECT_EQ((uint32_t)0x990951BA, t[3]); + EXPECT_EQ((uint32_t)0x076DC419, t[4]); + EXPECT_EQ((uint32_t)0x706AF48F, t[5]); + EXPECT_EQ((uint32_t)0xE963A535, t[6]); + EXPECT_EQ((uint32_t)0x9E6495A3, t[7]); + + EXPECT_EQ((uint32_t)0xB3667A2E, t[248]); + EXPECT_EQ((uint32_t)0xC4614AB8, t[249]); + EXPECT_EQ((uint32_t)0x5D681B02, t[250]); + EXPECT_EQ((uint32_t)0x2A6F2B94, t[251]); + EXPECT_EQ((uint32_t)0xB40BBE37, t[252]); + EXPECT_EQ((uint32_t)0xC30C8EA1, t[253]); + EXPECT_EQ((uint32_t)0x5A05DF1B, t[254]); + EXPECT_EQ((uint32_t)0x2D02EF8D, t[255]); + + // MPEG, @see https://github.com/ossrs/srs/blob/608c88b8f2b352cdbce3b89b9042026ea907e2d3/trunk/src/kernel/srs_kernel_utility.cpp#L691 + __crc32_make_table(t, 0x4c11db7, false); + + EXPECT_EQ((uint32_t)0x00000000, t[0]); + EXPECT_EQ((uint32_t)0x04c11db7, t[1]); + EXPECT_EQ((uint32_t)0x09823b6e, t[2]); + EXPECT_EQ((uint32_t)0x0d4326d9, t[3]); + EXPECT_EQ((uint32_t)0x130476dc, t[4]); + EXPECT_EQ((uint32_t)0x17c56b6b, t[5]); + EXPECT_EQ((uint32_t)0x1a864db2, t[6]); + EXPECT_EQ((uint32_t)0x1e475005, t[7]); + + EXPECT_EQ((uint32_t)0xafb010b1, t[248]); + EXPECT_EQ((uint32_t)0xab710d06, t[249]); + EXPECT_EQ((uint32_t)0xa6322bdf, t[250]); + EXPECT_EQ((uint32_t)0xa2f33668, t[251]); + EXPECT_EQ((uint32_t)0xbcb4666d, t[252]); + EXPECT_EQ((uint32_t)0xb8757bda, t[253]); + EXPECT_EQ((uint32_t)0xb5365d03, t[254]); + EXPECT_EQ((uint32_t)0xb1f740b4, t[255]); + + // MPEG, @see https://github.com/ossrs/srs/blob/608c88b8f2b352cdbce3b89b9042026ea907e2d3/trunk/src/kernel/srs_kernel_utility.cpp#L691 + __crc32_make_table(t, 0x4c11db7, false); + + EXPECT_EQ((uint32_t)0x00000000, t[0]); + EXPECT_EQ((uint32_t)0x04c11db7, t[1]); + EXPECT_EQ((uint32_t)0x09823b6e, t[2]); + EXPECT_EQ((uint32_t)0x0d4326d9, t[3]); + EXPECT_EQ((uint32_t)0x130476dc, t[4]); + EXPECT_EQ((uint32_t)0x17c56b6b, t[5]); + EXPECT_EQ((uint32_t)0x1a864db2, t[6]); + EXPECT_EQ((uint32_t)0x1e475005, t[7]); + + EXPECT_EQ((uint32_t)0xafb010b1, t[248]); + EXPECT_EQ((uint32_t)0xab710d06, t[249]); + EXPECT_EQ((uint32_t)0xa6322bdf, t[250]); + EXPECT_EQ((uint32_t)0xa2f33668, t[251]); + EXPECT_EQ((uint32_t)0xbcb4666d, t[252]); + EXPECT_EQ((uint32_t)0xb8757bda, t[253]); + EXPECT_EQ((uint32_t)0xb5365d03, t[254]); + EXPECT_EQ((uint32_t)0xb1f740b4, t[255]); +} + VOID TEST(KernelUtility, CRC32IEEE) +{ + if (true) { + string datas[] = { + "123456789", "srs", "ossrs.net", + "SRS's a simplest, conceptual integrated, industrial-strength live streaming origin cluster." + }; + + uint32_t checksums[] = { + 0xcbf43926, 0x7df334e9, 0x2f52242b, + 0x7e8677bd, + }; + + for (int i = 0; i < (int)(sizeof(datas)/sizeof(string)); i++) { + string data = datas[i]; + uint32_t checksum = checksums[i]; + EXPECT_EQ(checksum, srs_crc32_ieee(data.data(), data.length(), 0)); + } + + uint32_t previous = 0; + for (int i = 0; i < (int)(sizeof(datas)/sizeof(string)); i++) { + string data = datas[i]; + previous = srs_crc32_ieee(data.data(), data.length(), previous); + } + EXPECT_EQ((uint32_t)0x431b8785, previous); + } + + if (true) { + string data = "123456789srs"; + EXPECT_EQ((uint32_t)0xf567b5cf, srs_crc32_ieee(data.data(), data.length(), 0)); + } + + if (true) { + string data = "123456789"; + EXPECT_EQ((uint32_t)0xcbf43926, srs_crc32_ieee(data.data(), data.length(), 0)); + + data = "srs"; + EXPECT_EQ((uint32_t)0xf567b5cf, srs_crc32_ieee(data.data(), data.length(), 0xcbf43926)); + } +} + +VOID TEST(KernelUtility, CRC32MPEGTS) { string datas[] = { "123456789", "srs", "ossrs.net", @@ -1531,22 +1663,15 @@ VOID TEST(KernelUtility, CRC32IEEE) }; uint32_t checksums[] = { - 0xcbf43926, 0x7df334e9, 0x2f52242b, - 0x7e8677bd + 0x0376e6e7, 0xd9089591, 0xbd17933f, + 0x9f389f7d }; for (int i = 0; i < (int)(sizeof(datas)/sizeof(string)); i++) { string data = datas[i]; uint32_t checksum = checksums[i]; - EXPECT_EQ(checksum, srs_crc32_ieee(data.data(), data.length(), 0)); + EXPECT_EQ(checksum, (uint32_t)srs_crc32_mpegts(data.data(), data.length())); } - - uint32_t previous = 0; - for (int i = 0; i < (int)(sizeof(datas)/sizeof(string)); i++) { - string data = datas[i]; - previous = srs_crc32_ieee(data.data(), data.length(), previous); - } - EXPECT_EQ((uint32_t)0x431b8785, previous); } #endif