LZMA2: HT: default hashSize <= dictSize; -m3/-m4 lzma settings no mor…

…e explicily specify hashsize (in order to improve LimitCompressionMemory results) git-svn-id: https://freearc.svn.sourceforge.net/svnroot/freearc@637 3a4f7f31-9599-433d-91b1-573e8b61252c
abandonware · Sep 23, 2009 · 7f2cf74 · 7f2cf74
1 parent 182ef48
commit 7f2cf74
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Compression.hs b/Compression.hs
@@ -397,8 +397,8 @@ builtinMethodSubsts = [
     , ";Binary files compression with fast decompression"
     , "1binary = tor:3"
     , "2binary = tor:  96m:h64m"
-    , "3binary = lzma: 96m:h64m:fast  :mc8"
-    , "4binary = lzma: 96m:h64m:normal:mc16"
+    , "3binary = lzma: 96m:fast  :mc8"
+    , "4binary = lzma: 96m:normal:mc16"
     , "5binary = lzma: 16m:max"
     , "6binary = lzma: 32m:max"
     , "7binary = lzma: 64m:max"

diff --git a/Compression/LZMA2/C/LzmaEnc.c b/Compression/LZMA2/C/LzmaEnc.c
@@ -75,7 +75,7 @@ void LzmaEncProps_Normalize(CLzmaEncProps *p)
   if (p->hashSize == 0)
   {
     UInt32 hs = rounddown_to_power_of (p->dictSize, 2);
-    p->hashSize = p->btMode==MF_HashTable?  p->dictSize/sizeof(CLzRef)*2-1
+    p->hashSize = p->btMode==MF_HashTable?  p->dictSize/sizeof(CLzRef)    // for hashSize <= dictSize
                 : p->numHashBytes==2     ?  64*kb
                 : hs<=64*kb              ?  64*kb
                 : hs<=32*mb              ?  hs/2

diff --git a/Compression/LZMA2/C_LZMA.cpp b/Compression/LZMA2/C_LZMA.cpp
@@ -448,7 +448,7 @@ MemSize calcDictSize (LZMA_METHOD *p, MemSize mem)
       case kBT3:    return (MemSize)floor(mem4/11.5);
       case kBT4:    return (MemSize)floor(mem4/11.5);
       case kHC4:    return (MemSize)floor(mem4/7.5);
-      case kHT4:    return (MemSize)floor(mem4/1.75);      //// äåôîëòíûé õåø - äî 2x, ñì. LzmaEncProps_Normalize
+      case kHT4:    return (MemSize)floor(mem4/2.25);
     }
   }
   return 0;