Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make compression of zstd archive type more similar to zstdcli #354

Merged
merged 3 commits into from Sep 17, 2023
Merged

Make compression of zstd archive type more similar to zstdcli #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5697b3d
zstd compression - set source size as hint if it is known e. g. by fi…
sebres Sep 14, 2023
8a5e1c8
make compression of zstd archive type more similar to Zstandard CLI (…
sebres Sep 14, 2023
1eca571
.zst, .br: avoid setting of size hint for unknown size by `-si`, sinc…
sebres Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions C/zstdmt/brotli-mt_compress.c
View file
Open in desktop
Expand Up @@ -383,7 +383,7 @@ static size_t st_compress(void *arg)
/* 0, or not specified by user; could be chosen by compressor. */
uint32_t lgwin = 24 /* DEFAULT_LGWIN */;
/* Use file size to limit lgwin. */
if (ctx->unpackSize >= 0) {
if (ctx->unpackSize >= 0 && ctx->unpackSize != (uint64_t)(int64_t)-1) {
lgwin = BROTLI_MIN_WINDOW_BITS;
while (BROTLI_MAX_BACKWARD_LIMIT(lgwin) <
(uint64_t)ctx->unpackSize) {
Expand All @@ -393,7 +393,7 @@ static size_t st_compress(void *arg)
}
BrotliEncoderSetParameter(state, BROTLI_PARAM_LGWIN, lgwin);
}
if (ctx->unpackSize > 0) {
if (ctx->unpackSize > 0 && ctx->unpackSize != (uint64_t)(int64_t)-1) {
uint32_t size_hint = ctx->unpackSize < (1 << 30) ?
(uint32_t)ctx->unpackSize : (1u << 30);
BrotliEncoderSetParameter(state, BROTLI_PARAM_SIZE_HINT, size_hint);
Expand Down
4 changes: 4 additions & 0 deletions CPP/7zip/Archive/ZstdHandler.cpp
View file
Open in desktop
Expand Up @@ -286,6 +286,10 @@ static HRESULT UpdateArchive(
CMyComPtr<ICompressProgressInfo> localProgress = localProgressSpec;
localProgressSpec->Init(updateCallback, true);
NCompress::NZSTD::CEncoder *encoderSpec = new NCompress::NZSTD::CEncoder;
// by zstd archive type store dictID and checksum (similar to zstd client)
encoderSpec->dictIDFlag = 1;
encoderSpec->checksumFlag = 1;
encoderSpec->unpackSize = unpackSize;
CMyComPtr<ICompressCoder> encoder = encoderSpec;
RINOK(props.SetCoderProps(encoderSpec, NULL));
RINOK(encoder->Code(fileInStream, outStream, NULL, NULL, localProgress));
Expand Down
3 changes: 2 additions & 1 deletion CPP/7zip/Compress/BrotliEncoder.cpp
View file
Open in desktop
Expand Up @@ -15,7 +15,8 @@ CEncoder::CEncoder():
_numThreads(NWindows::NSystem::GetNumberOfProcessors()),
_Long(-1),
_WindowLog(-1),
_ctx(NULL)
_ctx(NULL),
unpackSize(0)
{
_props.clear();
}
Expand Down
25 changes: 24 additions & 1 deletion CPP/7zip/Compress/ZstdEncoder.cpp
View file
Open in desktop
Expand Up @@ -30,7 +30,10 @@ CEncoder::CEncoder():
_LdmHashLog(-1),
_LdmMinMatch(-1),
_LdmBucketSizeLog(-1),
_LdmHashRateLog(-1)
_LdmHashRateLog(-1),
dictIDFlag(-1),
checksumFlag(-1),
unpackSize(0)
{
_props.clear();
}
Expand Down Expand Up @@ -251,6 +254,20 @@ STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream,
err = ZSTD_CCtx_setParameter(_ctx, ZSTD_c_contentSizeFlag, 1);
if (ZSTD_isError(err)) return E_INVALIDARG;

if (dictIDFlag != -1) {
err = ZSTD_CCtx_setParameter(_ctx, ZSTD_c_dictIDFlag, dictIDFlag);
if (ZSTD_isError(err)) return E_INVALIDARG;
}
if (checksumFlag != -1) {
err = ZSTD_CCtx_setParameter(_ctx, ZSTD_c_checksumFlag, checksumFlag);
if (ZSTD_isError(err)) return E_INVALIDARG;
}

if (unpackSize && unpackSize != (UInt64)(Int64)-1) { // size is known
err = ZSTD_CCtx_setParameter(_ctx, ZSTD_c_srcSizeHint, (int)(unpackSize <= INT_MAX ? unpackSize : INT_MAX));
if (ZSTD_isError(err)) return E_INVALIDARG;
}

/* enable ldm for large windowlog values */
if (_WindowLog > 27 && _Long == 0)
_Long = 1;
Expand Down Expand Up @@ -320,6 +337,12 @@ STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream,
err = ZSTD_CCtx_setParameter(_ctx, ZSTD_c_ldmHashRateLog, _LdmHashRateLog);
if (ZSTD_isError(err)) return E_INVALIDARG;
}

//err = ZSTD_CCtx_setParameter(_ctx, ZSTD_c_literalCompressionMode, (int)ZSTD_ps_auto);
//if (ZSTD_isError(err)) return E_INVALIDARG;

//err = ZSTD_CCtx_setParameter(_ctx, ZSTD_c_enableDedicatedDictSearch, 1);
//if (ZSTD_isError(err)) return E_INVALIDARG;
}

for (;;) {
Expand Down
5 changes: 5 additions & 0 deletions CPP/7zip/Compress/ZstdEncoder.h
View file
Open in desktop
Expand Up @@ -67,6 +67,11 @@ class CEncoder:
Int32 _LdmHashRateLog;

public:

int dictIDFlag;
int checksumFlag;
UInt64 unpackSize;

MY_QUERYINTERFACE_BEGIN2(ICompressCoder)
MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt)
MY_QUERYINTERFACE_ENTRY(ICompressSetCoderProperties)
Expand Down