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

Introduced new compression level settings

Browse Source 
Changed position of parameter TargetLength
This commit is contained in:
Yann Collet
2016-02-13 02:08:46 +01:00
parent 82f4d7da03
commit 23e8aee224
4 changed files with 103 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zstd_compress.c
+91 -105
View File
@@ -74,6 +74,7 @@ size_t ZSTD_compressBound(size_t srcSize) { return FSE_compressBound(srcSize) +
/*-*************************************
* Sequence storage
***************************************/
/** ZSTD_resetFreqs() : for opt variants */
static void ZSTD_resetFreqs(seqStore_t* ssPtr)
{
unsigned u;
@@ -99,8 +100,6 @@ static void ZSTD_resetSeqStore(seqStore_t* ssPtr)
ssPtr->litLength = ssPtr->litLengthStart;
ssPtr->matchLength = ssPtr->matchLengthStart;
ssPtr->dumps = ssPtr->dumpsStart;
ZSTD_resetFreqs(ssPtr);
}
@@ -2261,122 +2260,109 @@ size_t ZSTD_compress(void* dst, size_t maxDstSize, const void* src, size_t srcSi
/*-===== Pre-defined compression levels =====-*/
#define ZSTD_MAX_CLEVEL 25
#define ZSTD_MAX_CLEVEL 21
unsigned ZSTD_maxCLevel(void) { return ZSTD_MAX_CLEVEL; }
static const ZSTD_parameters ZSTD_defaultParameters[4][ZSTD_MAX_CLEVEL+1] = {
{ /* "default" */
/* SL, W, C, H, S, L, strat */
{ 0, 0, 18, 12, 12, 1, 4, ZSTD_fast }, /* level 0 - never used */
{ 0, 0, 19, 13, 14, 1, 7, ZSTD_fast }, /* level 1 */
{ 0, 0, 19, 15, 16, 1, 6, ZSTD_fast }, /* level 2 */
{ 0, 0, 20, 18, 20, 1, 6, ZSTD_fast }, /* level 3 */
{ 0, 0, 21, 19, 21, 1, 6, ZSTD_fast }, /* level 4 */
{ 0, 0, 20, 14, 18, 3, 5, ZSTD_greedy }, /* level 5 */
{ 0, 0, 20, 18, 19, 3, 5, ZSTD_greedy }, /* level 6 */
{ 0, 0, 21, 17, 20, 3, 5, ZSTD_lazy }, /* level 7 */
{ 0, 0, 21, 19, 20, 3, 5, ZSTD_lazy }, /* level 8 */
{ 0, 0, 21, 20, 20, 3, 5, ZSTD_lazy2 }, /* level 9 */
{ 0, 0, 21, 19, 21, 4, 5, ZSTD_lazy2 }, /* level 10 */
{ 0, 0, 22, 20, 22, 4, 5, ZSTD_lazy2 }, /* level 11 */ // 42498419
{ 0, 0, 22, 20, 22, 5, 5, ZSTD_lazy2 }, /* level 12 */
{ 0, 0, 22, 21, 22, 5, 5, ZSTD_lazy2 }, /* level 13 */
{ 0, 0, 22, 22, 23, 5, 5, ZSTD_lazy2 }, /* level 14 */
{ 0, 0, 23, 23, 23, 5, 5, ZSTD_lazy2 }, /* level 15 */
{ 0, 0, 23, 21, 22, 5, 5, ZSTD_btlazy2 }, /* level 16 */ // 42113689
{ 0, 0, 23, 24, 23, 4, 5, ZSTD_btlazy2 }, /* level 17 */
{ 0, 0, 25, 24, 23, 5, 5, ZSTD_btlazy2 }, /* level 18 */
{ 0, 0, 25, 26, 23, 5, 5, ZSTD_btlazy2 }, /* level 19 */
{ 0, 12, 22, 20, 21, 3, 5, ZSTD_opt }, /* level 20 */
{ 0, 16, 23, 21, 22, 4, 4, ZSTD_opt }, /* level 21 */
{ 0, 32, 25, 25, 24, 5, 4, ZSTD_opt_bt }, /* level 22 */
{ 0, 64, 25, 26, 24, 6, 4, ZSTD_opt_bt }, /* level 23 */
{ 0,128, 26, 26, 25, 8, 4, ZSTD_opt_bt }, /* level 24 */
{ 0,256, 26, 27, 25, 10, 4, ZSTD_opt_bt }, /* level 25 */
/* l, W, C, H, S, L, SL, strat */
{ 0, 0, 0, 0, 0, 0, 0, ZSTD_fast }, /* level 0 - never used */
{ 0, 19, 13, 14, 1, 7, 4, ZSTD_fast }, /* level 1 */
{ 0, 19, 15, 16, 1, 6, 4, ZSTD_fast }, /* level 2 */
{ 0, 20, 18, 20, 1, 6, 4, ZSTD_fast }, /* level 3 */
{ 0, 21, 19, 21, 1, 6, 4, ZSTD_fast }, /* level 4 */
{ 0, 20, 14, 18, 3, 5, 4, ZSTD_greedy }, /* level 5 */
{ 0, 20, 18, 19, 3, 5, 4, ZSTD_greedy }, /* level 6 */
{ 0, 21, 17, 20, 3, 5, 4, ZSTD_lazy }, /* level 7 */
{ 0, 21, 19, 20, 3, 5, 4, ZSTD_lazy }, /* level 8 */
{ 0, 21, 20, 20, 3, 5, 4, ZSTD_lazy2 }, /* level 9 */
{ 0, 21, 19, 21, 4, 5, 4, ZSTD_lazy2 }, /* level 10 */
{ 0, 22, 20, 22, 4, 5, 4, ZSTD_lazy2 }, /* level 11 */
{ 0, 22, 20, 22, 5, 5, 4, ZSTD_lazy2 }, /* level 12 */
{ 0, 22, 21, 22, 5, 5, 4, ZSTD_lazy2 }, /* level 13 */
{ 0, 22, 22, 23, 5, 5, 4, ZSTD_lazy2 }, /* level 14 */
{ 0, 23, 23, 23, 5, 5, 4, ZSTD_lazy2 }, /* level 15 */
{ 0, 23, 21, 22, 5, 5, 4, ZSTD_btlazy2 }, /* level 16 */
{ 0, 23, 24, 23, 4, 5, 4, ZSTD_btlazy2 }, /* level 17 */
{ 0, 24, 25, 24, 4, 4, 24, ZSTD_opt_bt }, /* level 18 */
{ 0, 25, 25, 24, 5, 4, 40, ZSTD_opt_bt }, /* level 19 */
{ 0, 26, 26, 25, 8, 4,256, ZSTD_opt_bt }, /* level 20 */
{ 0, 26, 27, 25, 10, 4,256, ZSTD_opt_bt }, /* level 21 */
},
{ /* for srcSize <= 256 KB */
/* SL, W, C, H, S, L, strat */
{ 0, 0, 18, 13, 14, 1, 7, ZSTD_fast }, /* level 0 - never used */
{ 0, 0, 18, 14, 15, 1, 6, ZSTD_fast }, /* level 1 */
{ 0, 0, 18, 14, 15, 1, 5, ZSTD_fast }, /* level 2 */
{ 0, 0, 18, 12, 15, 3, 4, ZSTD_greedy }, /* level 3 */
{ 0, 0, 18, 13, 15, 4, 4, ZSTD_greedy }, /* level 4 */
{ 0, 0, 18, 14, 15, 5, 4, ZSTD_greedy }, /* level 5 */
{ 0, 0, 18, 13, 15, 4, 4, ZSTD_lazy }, /* level 6 */
{ 0, 0, 18, 14, 16, 5, 4, ZSTD_lazy }, /* level 7 */
{ 0, 0, 18, 15, 16, 6, 4, ZSTD_lazy }, /* level 8 */
{ 0, 0, 18, 15, 15, 7, 4, ZSTD_lazy }, /* level 9 */
{ 0, 0, 18, 16, 16, 7, 4, ZSTD_lazy }, /* level 10 */
{ 0, 0, 18, 16, 16, 8, 4, ZSTD_lazy }, /* level 11 */
{ 0, 0, 18, 17, 16, 8, 4, ZSTD_lazy }, /* level 12 */
{ 0, 0, 18, 17, 16, 9, 4, ZSTD_lazy }, /* level 13 */
{ 0, 0, 18, 18, 16, 9, 4, ZSTD_lazy }, /* level 14 */
{ 0, 0, 18, 17, 17, 9, 4, ZSTD_lazy2 }, /* level 15 */
{ 0, 0, 18, 18, 18, 9, 4, ZSTD_lazy2 }, /* level 16 */
{ 0, 0, 18, 18, 18, 10, 4, ZSTD_lazy2 }, /* level 17 */
{ 0, 0, 18, 18, 18, 11, 4, ZSTD_lazy2 }, /* level 18 */
{ 0, 0, 18, 18, 18, 12, 4, ZSTD_lazy2 }, /* level 19 */
{ 0, 0, 18, 18, 18, 13, 4, ZSTD_lazy2 }, /* level 20 */
{ 0, 0, 18, 18, 18, 10, 4, ZSTD_lazy2 }, /* level ??? */
{ 0, 0, 18, 18, 18, 11, 4, ZSTD_lazy2 }, /* level ??? */
{ 0, 0, 18, 18, 18, 12, 4, ZSTD_lazy2 }, /* level ??? */
{ 0, 0, 18, 18, 18, 13, 4, ZSTD_lazy2 }, /* level ??? */
{ 0, 18, 13, 14, 1, 7, 4, ZSTD_fast }, /* level 0 - never used */
{ 0, 18, 14, 15, 1, 6, 4, ZSTD_fast }, /* level 1 */
{ 0, 18, 14, 15, 1, 5, 4, ZSTD_fast }, /* level 2 */
{ 0, 18, 12, 15, 3, 4, 4, ZSTD_greedy }, /* level 3 */
{ 0, 18, 13, 15, 4, 4, 4, ZSTD_greedy }, /* level 4 */
{ 0, 18, 14, 15, 5, 4, 4, ZSTD_greedy }, /* level 5 */
{ 0, 18, 13, 15, 4, 4, 4, ZSTD_lazy }, /* level 6 */
{ 0, 18, 14, 16, 5, 4, 4, ZSTD_lazy }, /* level 7 */
{ 0, 18, 15, 16, 6, 4, 4, ZSTD_lazy }, /* level 8 */
{ 0, 18, 15, 15, 7, 4, 4, ZSTD_lazy }, /* level 9 */
{ 0, 18, 16, 16, 7, 4, 4, ZSTD_lazy }, /* level 10 */
{ 0, 18, 16, 16, 8, 4, 4, ZSTD_lazy }, /* level 11 */
{ 0, 18, 17, 16, 8, 4, 4, ZSTD_lazy }, /* level 12 */
{ 0, 18, 17, 16, 9, 4, 4, ZSTD_lazy }, /* level 13 */
{ 0, 18, 18, 16, 9, 4, 4, ZSTD_lazy }, /* level 14 */
{ 0, 18, 17, 17, 9, 4, 4, ZSTD_lazy2 }, /* level 15 */
{ 0, 18, 18, 18, 9, 4, 4, ZSTD_lazy2 }, /* level 16 */
{ 0, 18, 18, 18, 10, 4, 4, ZSTD_lazy2 }, /* level 17 */
{ 0, 18, 18, 18, 11, 4, 4, ZSTD_lazy2 }, /* level 18 */
{ 0, 18, 18, 18, 12, 4, 4, ZSTD_lazy2 }, /* level 19 */
{ 0, 18, 18, 18, 13, 4, 4, ZSTD_lazy2 }, /* level 20 */
{ 0, 18, 18, 18, 10, 4, 4, ZSTD_lazy2 }, /* level ??? */
},
{ /* for srcSize <= 128 KB */
/* W, C, H, S, L, strat */
{ 0, 0, 17, 12, 12, 1, 4, ZSTD_fast }, /* level 0 - never used */
{ 0, 0, 17, 12, 13, 1, 6, ZSTD_fast }, /* level 1 */
{ 0, 0, 17, 14, 16, 1, 5, ZSTD_fast }, /* level 2 */
{ 0, 0, 17, 15, 17, 1, 5, ZSTD_fast }, /* level 3 */
{ 0, 0, 17, 13, 15, 2, 4, ZSTD_greedy }, /* level 4 */
{ 0, 0, 17, 15, 17, 3, 4, ZSTD_greedy }, /* level 5 */
{ 0, 0, 17, 14, 17, 3, 4, ZSTD_lazy }, /* level 6 */
{ 0, 0, 17, 16, 17, 4, 4, ZSTD_lazy }, /* level 7 */
{ 0, 0, 17, 16, 17, 4, 4, ZSTD_lazy2 }, /* level 8 */
{ 0, 0, 17, 17, 16, 5, 4, ZSTD_lazy2 }, /* level 9 */
{ 0, 0, 17, 17, 16, 6, 4, ZSTD_lazy2 }, /* level 10 */
{ 0, 0, 17, 17, 16, 7, 4, ZSTD_lazy2 }, /* level 11 */
{ 0, 0, 17, 17, 16, 8, 4, ZSTD_lazy2 }, /* level 12 */
{ 0, 0, 17, 18, 16, 4, 4, ZSTD_btlazy2 }, /* level 13 */
{ 0, 0, 17, 18, 16, 5, 4, ZSTD_btlazy2 }, /* level 14 */
{ 0, 0, 17, 18, 16, 6, 4, ZSTD_btlazy2 }, /* level 15 */
{ 0, 0, 17, 18, 16, 7, 4, ZSTD_btlazy2 }, /* level 16 */
{ 0, 0, 17, 18, 16, 8, 4, ZSTD_btlazy2 }, /* level 17 */
{ 0, 0, 17, 18, 16, 9, 4, ZSTD_btlazy2 }, /* level 18 */
{ 0, 0, 17, 18, 16, 10, 4, ZSTD_btlazy2 }, /* level 19 */
{ 0, 0, 17, 18, 18, 12, 4, ZSTD_btlazy2 }, /* level 20 */
{ 0, 0, 17, 18, 16, 8, 4, ZSTD_btlazy2 }, /* level ??? */
{ 0, 0, 17, 18, 16, 9, 4, ZSTD_btlazy2 }, /* level ??? */
{ 0, 0, 17, 18, 16, 10, 4, ZSTD_btlazy2 }, /* level ??? */
{ 0, 0, 17, 18, 18, 12, 4, ZSTD_btlazy2 }, /* level ??? */
{ 0, 17, 12, 12, 1, 4, 4, ZSTD_fast }, /* level 0 - never used */
{ 0, 17, 12, 13, 1, 6, 4, ZSTD_fast }, /* level 1 */
{ 0, 17, 14, 16, 1, 5, 4, ZSTD_fast }, /* level 2 */
{ 0, 17, 15, 17, 1, 5, 4, ZSTD_fast }, /* level 3 */
{ 0, 17, 13, 15, 2, 4, 4, ZSTD_greedy }, /* level 4 */
{ 0, 17, 15, 17, 3, 4, 4, ZSTD_greedy }, /* level 5 */
{ 0, 17, 14, 17, 3, 4, 4, ZSTD_lazy }, /* level 6 */
{ 0, 17, 16, 17, 4, 4, 4, ZSTD_lazy }, /* level 7 */
{ 0, 17, 16, 17, 4, 4, 4, ZSTD_lazy2 }, /* level 8 */
{ 0, 17, 17, 16, 5, 4, 4, ZSTD_lazy2 }, /* level 9 */
{ 0, 17, 17, 16, 6, 4, 4, ZSTD_lazy2 }, /* level 10 */
{ 0, 17, 17, 16, 5, 4, 8, ZSTD_opt }, /* level 11 */
{ 0, 17, 17, 16, 6, 4,12, ZSTD_opt }, /* level 12 */
{ 0, 17, 18, 16, 4, 4, 4, ZSTD_btlazy2 }, /* level 13 */
{ 0, 17, 18, 16, 5, 4, 4, ZSTD_btlazy2 }, /* level 14 */
{ 0, 17, 18, 16, 6, 4, 4, ZSTD_btlazy2 }, /* level 15 */
{ 0, 17, 17, 16, 7, 4,16, ZSTD_opt }, /* level 16 */
{ 0, 17, 18, 16, 5, 4,20, ZSTD_opt_bt }, /* level 17 */
{ 0, 17, 18, 16, 6, 4,32, ZSTD_opt_bt }, /* level 18 */
{ 0, 17, 18, 16, 7, 4,64, ZSTD_opt_bt }, /* level 19 */
{ 0, 17, 18, 17, 9, 4,128, ZSTD_opt_bt }, /* level 20 */
{ 0, 17, 18, 17, 12, 4,256, ZSTD_opt_bt }, /* level ??? */
},
{ /* for srcSize <= 16 KB */
/* W, C, H, S, L, strat */
{ 0, 0, 0, 0, 0, 0, 0, ZSTD_fast }, /* level 0 - never used */
{ 0, 0, 14, 14, 14, 1, 4, ZSTD_fast }, /* level 1 */
{ 0, 0, 14, 14, 16, 1, 4, ZSTD_fast }, /* level 2 */
{ 0, 0, 14, 14, 14, 5, 4, ZSTD_greedy }, /* level 3 */
{ 0, 0, 14, 14, 14, 8, 4, ZSTD_greedy }, /* level 4 */
{ 0, 0, 14, 11, 14, 6, 4, ZSTD_lazy }, /* level 5 */
{ 0, 0, 14, 14, 13, 6, 5, ZSTD_lazy }, /* level 6 */
{ 0, 0, 14, 14, 14, 7, 6, ZSTD_lazy }, /* level 7 */
{ 0, 0, 14, 14, 14, 8, 4, ZSTD_lazy }, /* level 8 */
{ 0, 0, 14, 14, 15, 9, 4, ZSTD_lazy }, /* level 9 */
{ 0, 0, 14, 14, 15, 10, 4, ZSTD_lazy }, /* level 10 */
{ 0, 0, 14, 15, 15, 6, 4, ZSTD_btlazy2 }, /* level 11 */
{ 0, 0, 14, 15, 15, 7, 4, ZSTD_btlazy2 }, /* level 12 */
{ 0, 0, 14, 15, 15, 8, 4, ZSTD_btlazy2 }, /* level 13 */
{ 0, 0, 14, 15, 15, 9, 4, ZSTD_btlazy2 }, /* level 14 */
{ 0, 0, 14, 15, 15, 10, 4, ZSTD_btlazy2 }, /* level 15 */
{ 0, 0, 14, 15, 15, 11, 4, ZSTD_btlazy2 }, /* level 16 */
{ 0, 0, 14, 15, 15, 12, 4, ZSTD_btlazy2 }, /* level 17 */
{ 0, 0, 14, 15, 15, 13, 4, ZSTD_btlazy2 }, /* level 18 */
{ 0, 0, 14, 15, 15, 14, 4, ZSTD_btlazy2 }, /* level 19 */
{ 0, 0, 14, 15, 15, 15, 4, ZSTD_btlazy2 }, /* level 20 */
{ 0, 0, 14, 15, 15, 12, 4, ZSTD_btlazy2 }, /* level ??? */
{ 0, 0, 14, 15, 15, 13, 4, ZSTD_btlazy2 }, /* level ??? */
{ 0, 0, 14, 15, 15, 14, 4, ZSTD_btlazy2 }, /* level ??? */
{ 0, 0, 14, 15, 15, 15, 4, ZSTD_btlazy2 }, /* level ??? */
{ 0, 0, 0, 0, 0, 0, 4, ZSTD_fast }, /* level 0 - never used */
{ 0, 14, 14, 14, 1, 4, 4, ZSTD_fast }, /* level 1 */
{ 0, 14, 14, 16, 1, 4, 4, ZSTD_fast }, /* level 2 */
{ 0, 14, 14, 14, 5, 4, 4, ZSTD_greedy }, /* level 3 */
{ 0, 14, 14, 14, 8, 4, 4, ZSTD_greedy }, /* level 4 */
{ 0, 14, 11, 14, 6, 4, 4, ZSTD_lazy }, /* level 5 */
{ 0, 14, 14, 13, 6, 5, 4, ZSTD_lazy }, /* level 6 */
{ 0, 14, 14, 14, 7, 6, 4, ZSTD_lazy }, /* level 7 */
{ 0, 14, 14, 14, 8, 4, 4, ZSTD_lazy }, /* level 8 */
{ 0, 14, 14, 15, 9, 4, 4, ZSTD_lazy }, /* level 9 */
{ 0, 14, 14, 15, 10, 4, 4, ZSTD_lazy }, /* level 10 */
{ 0, 14, 15, 15, 6, 4, 4, ZSTD_btlazy2 }, /* level 11 */
{ 0, 14, 15, 15, 7, 4, 4, ZSTD_btlazy2 }, /* level 12 */
{ 0, 14, 15, 15, 8, 4, 4, ZSTD_btlazy2 }, /* level 13 */
{ 0, 14, 15, 15, 9, 4, 4, ZSTD_btlazy2 }, /* level 14 */
{ 0, 14, 15, 15, 10, 4, 4, ZSTD_btlazy2 }, /* level 15 */
{ 0, 14, 15, 15, 11, 4, 4, ZSTD_btlazy2 }, /* level 16 */
{ 0, 14, 15, 15, 12, 4, 4, ZSTD_btlazy2 }, /* level 17 */
{ 0, 14, 15, 15, 13, 4, 4, ZSTD_btlazy2 }, /* level 18 */
{ 0, 14, 15, 15, 14, 4, 4, ZSTD_btlazy2 }, /* level 19 */
{ 0, 14, 15, 15, 15, 4, 4, ZSTD_btlazy2 }, /* level 20 */
{ 0, 14, 15, 15, 12, 4, 4, ZSTD_btlazy2 }, /* level ??? */
},
};