Skip to content

Commit

Permalink
Compression: fixed some definitions - using rep+exe instead of exe+re…
Browse files Browse the repository at this point in the history 
…p, mm+delta for $bmp compression

git-svn-id: https://freearc.svn.sourceforge.net/svnroot/freearc@246 3a4f7f31-9599-433d-91b1-573e8b61252c
  • Loading branch information
bulatz committed Apr 14, 2009
1 parent 08755a7 commit 977a977
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 39 deletions.
41 changes: 20 additions & 21 deletions Compression.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ builtinMethodSubsts = [
, "0 = storing"
, "1 = 1b / $exe=exe+1b"
, "1x = 1"
, "# = #rep+exe+#xb / $obj=#rep+#xb / $text=#t"
, "# = #rep+exe+#xb / $obj=#b / $text=#t"
, "#x = #xb/#xt"
, ""
, ";Text files compression with slow decompression"
Expand Down Expand Up @@ -431,23 +431,24 @@ builtinMethodSubsts = [
, "1xt = 1xb"
, "2xt = 2xb"
, "3xt = dict: 64m:80% + tor:7:96m:h64m"
, "4xt = dict: 64m:75% + lzma: 96m:h64m:normal:mc16"
, "5xt = dict: 128m:75% + lzma: 16m:max"
, "6xt = dict: 128m:75% + lzma: 32m:max"
, "7xt = dict: 128m:75% + lzma: 64m:max"
, "8xt = dict: 128m:75% + lzma:128m:max"
, "9xt = dict: 128m:75% + lzma:255m:max"
, "4xt = dict: 64m:75% + 4binary"
, "#xt = dict: 128m:75% + #binary"
, ""
, ";Binary files compression with fast decompression"
, "1xb = tor:3"
, "2xb = tor:96m:h64m"
, "3xb = delta + lzma: 96m:h64m:fast:mc8"
, "4xb = delta + lzma: 96m:h64m:normal:mc16"
, "5xb = delta + lzma: 16m:max"
, "6xb = delta + lzma: 32m:max"
, "7xb = delta + lzma: 64m:max"
, "8xb = delta + lzma:128m:max"
, "9xb = delta + lzma:255m:max"
, "#xb = delta + #binary"
, ""
, ";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"
, "5binary = lzma: 16m:max"
, "6binary = lzma: 32m:max"
, "7binary = lzma: 64m:max"
, "8binary = lzma:128m:max"
, "9binary = lzma:255m:max"
, ""
, ";Synonyms"
, "bcj = exe"
Expand All @@ -456,7 +457,7 @@ builtinMethodSubsts = [
, "x# = #x" -- ïðèíèìàåì îïöèè òèïà "-mx7" äëÿ ìèìèêðèè ïîä 7-zip
, ""
, ";Compression modes involving external PPMONSTR.EXE"
, "#p = #pb/#pt"
, "#p = #rep+exe+#xb / $obj=#pb / $text=#pt"
, "5pt = dict:p: 64m:80% + lzp: 64m:32:h22:85% + pmm: 8:160m:r0"
, "6pt = dict:p: 64m:80% + lzp: 64m:64:h22:85% + pmm:16:384m:r1"
, "7pt = dict:p:128m:80% + lzp:128m:64:h23:85% + pmm:20:768m:r1"
Expand All @@ -475,29 +476,27 @@ builtinMethodSubsts = [
, "#qt = #pt"
, "#qb = #pb"
, ""
, ";Sound wave files are best compressed with TTA algorithm"
, ";Sound wave files are compressed best with TTA"
, "wav = tta ;best compression"
, "wavfast = tta:m1 ;faster compression and decompression"
, "1$wav = wavfast"
, "2$wav = wavfast"
, "#$wav = wav"
, "#x$wav = wavfast"
, "#p$wav = wav"
, "#r$wav = #$wav"
, ""
, ";Bitmap graphic files are best compressed with GRZip algorithm"
, ";Bitmap graphic files are compressed best with GRZip"
, "bmp = mm + grzip:m1:l:a ;best compression"
, "bmpfast = mm + grzip:m4:l:a ;faster compression"
, "bmpfastest = mm:d1 + tor:3 ;fastest one"
, "bmpfastest = mm:d1 + tor:3:t0 ;fastest one"
, "1$bmp = bmpfastest"
, "2$bmp = bmpfastest"
, "3$bmp = bmpfast"
, "#$bmp = bmp"
, "1x$bmp = bmpfastest"
, "2x$bmp = bmpfastest"
, "#x$bmp = mm+#xb"
, "#x$bmp = mm+#binary"
, "#p$bmp = bmp"
, "#r$bmp = #$bmp"
, ""
, ";Quick & dirty compression for data already compressed"
, "4$compressed = rep:96m + tor:c3"
Expand Down
2 changes: 0 additions & 2 deletions Documentation/History.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,6 @@
filetype detection: check for MM on large files
Priorityio.doc
bugs
-max - exe+rep ������ rep+exe
-m9x $bmp mm+delta+...
*Last � ������� - ������������ ����� ������� �� �������������
update GUI docs
sfx - ��������� � �������������� ������������� ������ tempfile
Expand Down
32 changes: 16 additions & 16 deletions Tests/arc.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,25 +161,25 @@ dicte1 = dict:250mb:l8192:m6000:s6000
1iso = 1p$iso
2iso = 2p$iso
3iso = 3p$iso
4iso = ecm+precomp+exe+delta+rep:512mb+lzma:1gb:128:ht4:mc16
5iso = ecm+precomp+exe+delta+rep:512mb+lzma:1gb:128:ht4:mc32
6iso = ecm+precomp+exe+delta+rep:512mb+lzma:1gb:128:ht4:mc64
7iso = ecm+precomp+exe+delta+rep:512mb+lzma:1gb:200:ht4:mc128
8iso = ecm+precomp+exe+delta+rep:512mb+lzma:1gb:273:ht4:mc256
9iso = ecm+precomp+exe+delta+rep:512mb+lzma:1gb:273:ht4:mc512
4iso = ecm+precomp+rep:512mb+exe+delta+lzma:1gb:128:ht4:mc16
5iso = ecm+precomp+rep:512mb+exe+delta+lzma:1gb:128:ht4:mc32
6iso = ecm+precomp+rep:512mb+exe+delta+lzma:1gb:128:ht4:mc64
7iso = ecm+precomp+rep:512mb+exe+delta+lzma:1gb:200:ht4:mc128
8iso = ecm+precomp+rep:512mb+exe+delta+lzma:1gb:273:ht4:mc256
9iso = ecm+precomp+rep:512mb+exe+delta+lzma:1gb:273:ht4:mc512

; // ISO met 7z-BCJ2 exe filter //
1isb = 1p$iso
2isb = 2p$iso
3isb = 3p$iso
4isb = ecm+precomp+bcj2+delta+rep:512mb+lzma:1gb:128:ht4:mc16
5isb = ecm+precomp+bcj2+delta+rep:512mb+lzma:1gb:128:ht4:mc32
6isb = ecm+precomp+bcj2+delta+rep:512mb+lzma:1gb:128:ht4:mc64
7isb = ecm+precomp+bcj2+delta+rep:512mb+lzma:1gb:200:ht4:mc128
8isb = ecm+precomp+bcj2+delta+rep:512mb+lzma:1gb:273:ht4:mc256
9isb = ecm+precomp+bcj2+delta+rep:512mb+lzma:1gb:273:ht4:mc512
;8isb = ecm+precomp+bcj2+delta+rep:512mb+lzma:1gb:273:ht4:mc1024
;9isb = ecm+precomp+bcj2+delta+rep:512mb+lzma:1gb:273:ht4:mc2048
4isb = ecm+precomp+rep:512mb+bcj2+delta+lzma:1gb:128:ht4:mc16
5isb = ecm+precomp+rep:512mb+bcj2+delta+lzma:1gb:128:ht4:mc32
6isb = ecm+precomp+rep:512mb+bcj2+delta+lzma:1gb:128:ht4:mc64
7isb = ecm+precomp+rep:512mb+bcj2+delta+lzma:1gb:200:ht4:mc128
8isb = ecm+precomp+rep:512mb+bcj2+delta+lzma:1gb:273:ht4:mc256
9isb = ecm+precomp+rep:512mb+bcj2+delta+lzma:1gb:273:ht4:mc512
;8isb = ecm+precomp+rep:512mb+bcj2+delta+lzma:1gb:273:ht4:mc1024
;9isb = ecm+precomp+rep:512mb+bcj2+delta+lzma:1gb:273:ht4:mc2048

#is = exe + #pb/$text = #tr /$wav = tta /$bmp = mm+bliz /$jpg = jpg /$jpgsolid=precomp+rep:32 /$precomp=precomp+exe+ #pb /$iso = #iso
#ib = bcj2 + #pb/$text = #tr /$wav = tta /$bmp = mm+bliz /$jpg = jpg /$jpgsolid=precomp+rep:32 /$precomp=precomp+bcj2+ #pb /$iso = #isb
Expand All @@ -189,8 +189,8 @@ dicte1 = dict:250mb:l8192:m6000:s6000
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

;Use external compressors defined below in -m5p..-m9p modes
#p$iso = ecm + precomp + exe + #pb
#p$precomp = precomp + exe + #pb
#p$iso = ecm + precomp + #rep + exe + #xb
#p$precomp = precomp + #rep + exe + #xb
#p$jpgsolid = precomp + rep:32
#p$jpg = jpg

Expand Down

0 comments on commit 977a977

Please sign in to comment.