]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge pull request #1057 from facebook/lrmSettings
authorYann Collet <Cyan4973@users.noreply.github.com>
Wed, 21 Mar 2018 12:59:39 +0000 (05:59 -0700)
committerGitHub <noreply@github.com>
Wed, 21 Mar 2018 12:59:39 +0000 (05:59 -0700)
LRM parameters

1  2 
lib/compress/zstd_compress.c
lib/compress/zstd_compress_internal.h
lib/compress/zstd_ldm.c
lib/compress/zstd_ldm.h
lib/compress/zstdmt_compress.c
lib/zstd.h

Simple merge
Simple merge
Simple merge
index 84d3723cee9c9d212174ea52d98079a2b2e96e3c,175a42cc69e40073b355b8587a516789e1630142..0c3789ff137ccf18680a0feb701a88516661768d
@@@ -61,25 -60,12 +60,22 @@@ size_t ZSTD_ldm_generateSequences
   * NOTE: This function does not return any errors.
   */
  size_t ZSTD_ldm_blockCompress(rawSeqStore_t* rawSeqStore,
-     ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-     ZSTD_compressionParameters const* cParams, void const* src, size_t srcSize,
-     int const extDict);
+             ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+             ZSTD_compressionParameters const* cParams,
+             void const* src, size_t srcSize,
+             int const extDict);
  
 +/**
 + * ZSTD_ldm_skipSequences():
 + *
 + * Skip past `srcSize` bytes worth of sequences in `rawSeqStore`.
 + * Avoids emitting matches less than `minMatch` bytes.
 + * Must be called for data with is not passed to ZSTD_ldm_blockCompress().
 + */
 +void ZSTD_ldm_skipSequences(rawSeqStore_t* rawSeqStore, size_t srcSize,
 +    U32 const minMatch);
 +
  
- /** ZSTD_ldm_initializeParameters() :
-  *  Initialize the long distance matching parameters to their default values. */
- size_t ZSTD_ldm_initializeParameters(ldmParams_t* params, U32 enableLdm);
  /** ZSTD_ldm_getTableSize() :
   *  Estimate the space needed for long distance matching tables or 0 if LDM is
   *  disabled.
Simple merge
diff --cc lib/zstd.h
Simple merge