ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Checking noCompressBlock explicitly for rep code confirmation

Browse Source
This commit is contained in:
Bimba Shrestha
2019-11-21 13:06:26 -08:00
parent 8f0c2d04c8
commit 0451accab1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+3 -1
View File
@@ -2470,8 +2470,10 @@ static size_t ZSTD_compressBlock_targetCBlockSize(ZSTD_CCtx* zc,
* encode using ZSTD_noCompressSuperBlock writing sub blocks * encode using ZSTD_noCompressSuperBlock writing sub blocks
* in uncompressed mode. * in uncompressed mode.
*/ */
int usingNoCompressSuperBlock = 0;
if (cSize == 0) { if (cSize == 0) {
cSize = ZSTD_noCompressSuperBlock(dst, dstCapacity, src, srcSize, zc->appliedParams.targetCBlockSize, lastBlock); cSize = ZSTD_noCompressSuperBlock(dst, dstCapacity, src, srcSize, zc->appliedParams.targetCBlockSize, lastBlock);
usingNoCompressSuperBlock = 1;
/* In compression, there is an assumption that a compressed block is always /* In compression, there is an assumption that a compressed block is always
* within the size of ZSTD_compressBound(). However, SuperBlock compression * within the size of ZSTD_compressBound(). However, SuperBlock compression
* can exceed the limit due to overhead of headers from SubBlocks. * can exceed the limit due to overhead of headers from SubBlocks.
@@ -2511,7 +2513,7 @@ static size_t ZSTD_compressBlock_targetCBlockSize(ZSTD_CCtx* zc,
} }
} }
if (!ZSTD_isError(cSize) && cSize != 0) { if (!ZSTD_isError(cSize) && !usingNoCompressSuperBlock) {
/* confirm repcodes and entropy tables when emitting a compressed block */ /* confirm repcodes and entropy tables when emitting a compressed block */
ZSTD_compressedBlockState_t* const tmp = zc->blockState.prevCBlock; ZSTD_compressedBlockState_t* const tmp = zc->blockState.prevCBlock;
zc->blockState.prevCBlock = zc->blockState.nextCBlock; zc->blockState.prevCBlock = zc->blockState.nextCBlock;