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

minor update of literal cost function

Browse Source 
just assert() there is no negative cost evaluation for literals
This commit is contained in:
Yann Collet
2018-05-29 15:34:50 -07:00
parent 463a0fe38b
commit 809f2f9322
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_opt.c
+5 -6
View File
@@ -189,12 +189,11 @@ static U32 ZSTD_rawLiteralsCost(const BYTE* const literals, U32 const litLength,
return (litLength*6) * BITCOST_MULTIPLIER; /* 6 bit per literal - no statistic used */ return (litLength*6) * BITCOST_MULTIPLIER; /* 6 bit per literal - no statistic used */
/* dynamic statistics */ /* dynamic statistics */
{ U32 price, u; { U32 price = litLength * optPtr->litSumBasePrice;
for (u=0, price=0; u < litLength; u++) { U32 u;
U32 const litWeight = WEIGHT(optPtr->litFreq[literals[u]], optLevel); for (u=0; u < litLength; u++) {
U32 litCost = optPtr->litSumBasePrice - litWeight; assert(WEIGHT(optPtr->litFreq[literals[u]], optLevel) <= optPtr->litSumBasePrice); /* literal cost should never be negative */
//if (litCost < BITCOST_MULTIPLIER) litCost = BITCOST_MULTIPLIER; /* minimum 1 bit per symbol (huffman) */ price -= WEIGHT(optPtr->litFreq[literals[u]], optLevel);
price += litCost;
} }
return price; return price;
} }