Use 64MiB chunks by default for solid LZMS

diff --git a/doc/man1/wimlib-imagex-capture.1 b/doc/man1/wimlib-imagex-capture.1
index 5f540473fb4952774a99e36c5b8d0b4df685c80f..8c18a277e6b3bbc9b0772aba225a9818921e2ff6 100644 (file)
--- a/doc/man1/wimlib-imagex-capture.1
+++ b/doc/man1/wimlib-imagex-capture.1
@@ -256,7 +256,7 @@ compression, as these are two different things.
 .TP
 \fB--solid-chunk-size\fR=\fISIZE\fR
 Like \fB--chunk-size\fR, but set the chunk size used in solid resources.  The
 .TP
 \fB--solid-chunk-size\fR=\fISIZE\fR
 Like \fB--chunk-size\fR, but set the chunk size used in solid resources.  The

-default, assuming LZMS compression, is 32MiB (33554432).  This option only has
+default, assuming LZMS compression, is 64MiB (67108864).  This option only has

 an effect when \fB--solid\fR is also specified.  For maximum compatibility with
 the Microsoft implementation, do not use this option.
 .TP
 an effect when \fB--solid\fR is also specified.  For maximum compatibility with
 the Microsoft implementation, do not use this option.
 .TP

diff --git a/include/wimlib.h b/include/wimlib.h
index c2ecb48dffdf8e11e5ab7ef94c96cb2579d40d7f..47630bcf9ddfe3083d67bbae30dffa866862e24a 100644 (file)
--- a/include/wimlib.h
+++ b/include/wimlib.h
@@ -517,7 +517,7 @@ enum wimlib_compression_type {
         *
         * If using wimlib_create_compressor() to create an LZMS compressor
         * directly, the @p max_block_size parameter may be any positive value
         *
         * If using wimlib_create_compressor() to create an LZMS compressor
         * directly, the @p max_block_size parameter may be any positive value

-        * up to and including <c>1180427429</c>.
+        * up to and including <c>2^30</c>.

         */
        WIMLIB_COMPRESSION_TYPE_LZMS = 3,
 };
         */
        WIMLIB_COMPRESSION_TYPE_LZMS = 3,
 };


@@ -2232,7 +2232,7 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour
  * all streams recompressed in solid mode.
  *
  * Currently, new solid resources will, by default, be written using LZMS
  * all streams recompressed in solid mode.
  *
  * Currently, new solid resources will, by default, be written using LZMS

- * compression with 32 MiB (33554432 byte) chunks.  Use
+ * compression with 64 MiB (67108864 byte) chunks.  Use

  * wimlib_set_output_pack_compression_type() and/or
  * wimlib_set_output_pack_chunk_size() to change this.  This is independent of
  * the WIM's main compression type and chunk size; you can have a WIM that
  * wimlib_set_output_pack_compression_type() and/or
  * wimlib_set_output_pack_chunk_size() to change this.  This is independent of
  * the WIM's main compression type and chunk size; you can have a WIM that

diff --git a/src/wim.c b/src/wim.c
index 27708e235138a6ba282a759a713c2e33f9136968..4fc02efb6e087fe0951f4b58cf0cc418a8432e96 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -60,9 +60,9 @@ static u32
 wim_default_solid_chunk_size(int ctype) {
        switch (ctype) {
        case WIMLIB_COMPRESSION_TYPE_LZMS:
 wim_default_solid_chunk_size(int ctype) {
        switch (ctype) {
        case WIMLIB_COMPRESSION_TYPE_LZMS:

-               return 1U << 25; /* 33554432  */
+               return (u32)1 << 26; /* 67108864  */

        default:
        default:

-               return 1U << 15; /* 32768     */
+               return (u32)1 << 15; /* 32768     */

        }
 }
 
        }
 }