ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer pass srcSize to minTableLog

Browse Source
This commit is contained in:
Danielle Rozenblit
2022-10-17 08:03:44 -07:00
parent b34729018c
commit a910489ff5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/common/huf.h
+1 -1
View File
@@ -190,7 +190,7 @@ typedef enum {
* For example, it's possible to compress several blocks using the same 'CTable', * For example, it's possible to compress several blocks using the same 'CTable',
* or to save and regenerate 'CTable' using external methods. * or to save and regenerate 'CTable' using external methods.
*/ */
unsigned HUF_minTableLog(size_t srcSize, unsigned symbolCardinality); unsigned HUF_minTableLog(unsigned symbolCardinality);
unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue); unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue);
unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, void* workSpace, unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, void* workSpace,
size_t wkspSize, HUF_CElt* table, const unsigned* count, HUF_depth_mode depthMode); /* table is used as scratch space for building and testing tables, not a return value */ size_t wkspSize, HUF_CElt* table, const unsigned* count, HUF_depth_mode depthMode); /* table is used as scratch space for building and testing tables, not a return value */
lib/compress/huf_compress.c
+3 -3
View File
@@ -1247,16 +1247,16 @@ unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue)
return cardinality; return cardinality;
} }
unsigned HUF_minTableLog(size_t srcSize, unsigned symbolCardinality) unsigned HUF_minTableLog(unsigned symbolCardinality)
{ {
U32 minBitsSymbols = ZSTD_highbit32(symbolCardinality) + 1; U32 minBitsSymbols = ZSTD_highbit32(symbolCardinality) + 1;
assert(srcSize > 1); /* Not supported, RLE should be used instead */
return minBitsSymbols; return minBitsSymbols;
} }
unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, void* workSpace, size_t wkspSize, HUF_CElt* table, const unsigned* count, HUF_depth_mode depthMode) unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, void* workSpace, size_t wkspSize, HUF_CElt* table, const unsigned* count, HUF_depth_mode depthMode)
{ {
unsigned optLog = FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 1); unsigned optLog = FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 1);
assert(srcSize > 1); /* Not supported, RLE should be used instead */
if (depthMode == HUF_depth_optimal) { /** Test valid depths and return optimal **/ if (depthMode == HUF_depth_optimal) { /** Test valid depths and return optimal **/
BYTE* dst = (BYTE*)workSpace + sizeof(HUF_WriteCTableWksp); BYTE* dst = (BYTE*)workSpace + sizeof(HUF_WriteCTableWksp);
@@ -1268,7 +1268,7 @@ unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxS
if (wkspSize < sizeof(HUF_buildCTable_wksp_tables)) return optLog; if (wkspSize < sizeof(HUF_buildCTable_wksp_tables)) return optLog;
for (huffLog = HUF_minTableLog(srcSize, symbolCardinality); huffLog <= maxTableLog; huffLog++) { for (huffLog = HUF_minTableLog(symbolCardinality); huffLog <= maxTableLog; huffLog++) {
maxBits = HUF_buildCTable_wksp(table, count, maxBits = HUF_buildCTable_wksp(table, count,
maxSymbolValue, huffLog, maxSymbolValue, huffLog,
workSpace, wkspSize); workSpace, wkspSize);