X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompress_parallel.c;h=376e59d6a2fdca8a05fae9486d58fc0f51bba08d;hb=0b43e8dbe72a888c3b90d303aed074dd5a98360d;hp=fa7f5dde113750adea8a1b43f12227748cd5109d;hpb=4263fdbc0599a27356b6afb9e6bf6daf786c1363;p=wimlib

diff --git a/src/compress_parallel.c b/src/compress_parallel.c
index fa7f5dde..376e59d6 100644
--- a/src/compress_parallel.c
+++ b/src/compress_parallel.c
@@ -423,16 +423,26 @@ new_parallel_chunk_compressor(int out_ctype, u32 out_chunk_size,
 
 	desired_num_threads = num_threads;
 
-	chunks_per_msg = MAX_CHUNKS_PER_MSG;
-	msgs_per_thread = 2;
+	if (out_chunk_size < ((u32)1 << 23)) {
+		chunks_per_msg = MAX_CHUNKS_PER_MSG;
+		msgs_per_thread = 2;
+	} else {
+		/* Big chunks: Just have one buffer per thread --- more would
+		 * just waste memory.  */
+		chunks_per_msg = 1;
+		msgs_per_thread = 1;
+	}
 	for (;;) {
 		approx_mem_required =
 			(u64)chunks_per_msg *
 			(u64)msgs_per_thread *
 			(u64)num_threads *
 			(u64)out_chunk_size
+			+ out_chunk_size
 			+ 1000000
-			+ (out_chunk_size * num_threads * 4);
+			+ num_threads * wimlib_get_compressor_needed_memory(out_ctype,
+									    out_chunk_size,
+									    NULL);
 		if (approx_mem_required <= max_memory)
 			break;