lzms-compress.c: Fix initialization of lzms_default

[wimlib] / src / lzms-compress.c

diff --git a/src/lzms-compress.c b/src/lzms-compress.c
index 72aef31b14fda69dd530bb7c5bc8e1cfaeccd92b..6f17f5db1e3f56a82044eae0d86e4c814ea48522 100644 (file)
--- a/src/lzms-compress.c
+++ b/src/lzms-compress.c
@@ -24,8 +24,7 @@
 /* This a compressor for the LZMS compression format.  More details about this
  * format can be found in lzms-decompress.c.
  *
- * This is currently an unsophisticated implementation that is fast but does not
- * attain the best compression ratios allowed by the format.
+ * NOTE: this compressor currently does not code any delta matches.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -38,7 +37,6 @@
 #include "wimlib/compress_common.h"
 #include "wimlib/endianness.h"
 #include "wimlib/error.h"
-#include "wimlib/lz_hash.h"
 #include "wimlib/lz_sarray.h"
 #include "wimlib/lzms.h"
 #include "wimlib/util.h"
@@ -47,8 +45,6 @@
 #include <limits.h>
 #include <pthread.h>
 
-#define LZMS_OPTIM_ARRAY_SIZE  1024
-
 struct lzms_compressor;
 struct lzms_adaptive_state {
        struct lzms_lz_lru_queues lru;
@@ -180,12 +176,6 @@ struct lzms_compressor {
        /* Size of the data in @buffer.  */
        u32 window_size;
 
-#if 0
-       /* Temporary array used by lz_analyze_block(); must be at least as long
-        * as the window.  */
-       u32 *prev_tab;
-#endif
-
        /* Suffix array match-finder.  */
        struct lz_sarray lz_sarray;
 
@@ -594,48 +584,6 @@ lzms_encode_lz_match(struct lzms_compressor *ctx, u32 length, u32 offset)
        lzms_end_encode_item(ctx, length);
 }
 
-#if 0
-static void
-lzms_record_literal(u8 literal, void *_ctx)
-{
-       struct lzms_compressor *ctx = _ctx;
-
-       lzms_encode_literal(ctx, literal);
-}
-
-static void
-lzms_record_match(unsigned length, unsigned offset, void *_ctx)
-{
-       struct lzms_compressor *ctx = _ctx;
-
-       lzms_encode_lz_match(ctx, length, offset);
-}
-
-static void
-lzms_fast_encode(struct lzms_compressor *ctx)
-{
-       static const struct lz_params lzms_lz_params = {
-               .min_match      = 3,
-               .max_match      = UINT_MAX,
-               .max_offset     = UINT_MAX,
-               .nice_match     = 64,
-               .good_match     = 32,
-               .max_chain_len  = 64,
-               .max_lazy_match = 258,
-               .too_far        = 4096,
-       };
-
-       lz_analyze_block(ctx->window,
-                        ctx->window_size,
-                        lzms_record_match,
-                        lzms_record_literal,
-                        ctx,
-                        &lzms_lz_params,
-                        ctx->prev_tab);
-
-}
-#endif
-
 /* Fast heuristic cost evaluation to use in the inner loop of the match-finder.
  * Unlike lzms_get_lz_match_cost(), which does a true cost evaluation, this
  * simply prioritize matches based on their offset.  */
@@ -927,12 +875,13 @@ lzms_get_near_optimal_match(struct lzms_compressor *ctx)
  * - The costs of literals and matches are estimated using the range encoder
  *   states and the semi-adaptive Huffman codes.  Except for range encoding
  *   states, costs are assumed to be constant throughout a single run of the
- *   parsing algorithm, which can parse up to LZMS_OPTIM_ARRAY_SIZE bytes of
- *   data.  This introduces a source of inaccuracy because the probabilities and
- *   Huffman codes can change over this part of the data.
+ *   parsing algorithm, which can parse up to @optim_array_length (from the
+ *   `struct wimlib_lzms_compressor_params') bytes of data.  This introduces a
+ *   source of inaccuracy because the probabilities and Huffman codes can change
+ *   over this part of the data.
  */
 static void
-lzms_normal_encode(struct lzms_compressor *ctx)
+lzms_encode(struct lzms_compressor *ctx)
 {
        struct raw_match match;
 
@@ -993,7 +942,6 @@ lzms_init_compressor(struct lzms_compressor *ctx, const u8 *udata, u32 ulen,
 
        /* Copy the uncompressed data into the @ctx->window buffer.  */
        memcpy(ctx->window, udata, ulen);
-       memset(&ctx->window[ulen], 0, 8);
        ctx->cur_window_pos = 0;
        ctx->window_size = ulen;
 
@@ -1147,11 +1095,7 @@ lzms_compress(const void *uncompressed_data, size_t uncompressed_size,
 
        /* Compute and encode a literal/match sequence that decompresses to the
         * preprocessed data.  */
-#if 1
-       lzms_normal_encode(ctx);
-#else
-       lzms_fast_encode(ctx);
-#endif
+       lzms_encode(ctx);
 
        /* Get and return the compressed data size.  */
        compressed_size = lzms_finalize(ctx, compressed_data,
@@ -1216,9 +1160,6 @@ lzms_free_compressor(void *_ctx)
 
        if (ctx) {
                FREE(ctx->window);
-#if 0
-               FREE(ctx->prev_tab);
-#endif
                FREE(ctx->matches);
                lz_sarray_destroy(&ctx->lz_sarray);
                lz_match_chooser_destroy(&ctx->mc);
@@ -1227,7 +1168,9 @@ lzms_free_compressor(void *_ctx)
 }
 
 static const struct wimlib_lzms_compressor_params lzms_default = {
-       .hdr = sizeof(struct wimlib_lzms_compressor_params),
+       .hdr = {
+               .size = sizeof(struct wimlib_lzms_compressor_params),
+       },
        .min_match_length = 2,
        .max_match_length = UINT32_MAX,
        .nice_match_length = 32,
@@ -1269,12 +1212,6 @@ lzms_create_compressor(size_t max_block_size,
        if (ctx->window == NULL)
                goto oom;
 
-#if 0
-       ctx->prev_tab = MALLOC(max_block_size * sizeof(ctx->prev_tab[0]));
-       if (ctx->prev_tab == NULL)
-               goto oom;
-#endif
-
        ctx->matches = MALLOC(min(params->max_match_length -
                                        params->min_match_length + 1,
                                  params->max_matches_per_pos) *