Update Lizard - use internal HUF and FSE entropy

- AdjustLiz.sh fixes some double defines with zstd of lizard
- lizard uses it's own entropy lib again
- this will fix #302

Signed-off-by: Tino Reichardt <milky-7zip@mcmilk.de>
This commit is contained in:
Tino Reichardt
2023-02-24 22:19:40 +01:00
parent 36c2a9c760
commit b2d7bd30d7
29 changed files with 6133 additions and 46 deletions

View File

@@ -46,7 +46,7 @@ extern "C" {
#include <stdlib.h> /* malloc, calloc, free */
#include <string.h> /* memset, memcpy */
#include <stdint.h> /* intptr_t */
#include "../zstd/mem.h"
#include "mem.h"
#include "lizard_compress.h" /* LIZARD_GCC_VERSION */
//#define LIZARD_USE_LOGS
@@ -85,7 +85,7 @@ extern "C" {
#define LIZARD_BLOCK_SIZE_PAD (LIZARD_BLOCK_SIZE+32)
#define LIZARD_COMPRESS_ADD_BUF (5*LIZARD_BLOCK_SIZE_PAD)
#ifndef LIZARD_NO_HUFFMAN
#define LIZARD_COMPRESS_ADD_HUF HUF_compressBound(LIZARD_BLOCK_SIZE_PAD)
#define LIZARD_COMPRESS_ADD_HUF LIZ_HUF_compressBound(LIZARD_BLOCK_SIZE_PAD)
#define LIZARD_HUF_BLOCK_SIZE LIZARD_BLOCK_SIZE
#else
#define LIZARD_COMPRESS_ADD_HUF 0
@@ -192,6 +192,13 @@ struct Lizard_stream_s
const BYTE* destBase;
};
struct Lizard_streamDecode_s {
const BYTE* externalDict;
size_t extDictSize;
const BYTE* prefixEnd;
size_t prefixSize;
};
struct Lizard_dstream_s
{
const BYTE* offset16Ptr;