Merge pull request #2715 from senhuang42/sequence_api_3

[RFC] Add internal API for converting ZSTD_Sequence into seqStore
This commit is contained in:
sen
2021-06-24 13:02:11 -04:00
committed by GitHub
+17 -6
View File
@@ -3725,6 +3725,16 @@ static size_t ZSTD_compressBlock_splitBlock(ZSTD_CCtx* zc,
return cSize;
}
/* ZSTD_convertBlockSequencesToSeqStore()
* Converts an array of ZSTD_Sequence* with the corresponding original src buffer into
* the seqStore of a cctx.
*
* Returns 0 on success, ZSTD_error on failure.
*/
static UNUSED_ATTR size_t ZSTD_convertBlockSequencesToSeqStore(ZSTD_CCtx* cctx,
const ZSTD_Sequence* inSeqs, size_t inSeqsSize,
const void* src, size_t srcSize);
static size_t ZSTD_compressBlock_internal(ZSTD_CCtx* zc,
void* dst, size_t dstCapacity,
const void* src, size_t srcSize, U32 frame)
@@ -3761,12 +3771,6 @@ static size_t ZSTD_compressBlock_internal(ZSTD_CCtx* zc,
zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */,
zc->bmi2);
if (zc->seqCollector.collectSequences) {
ZSTD_copyBlockSequences(zc);
return 0;
}
if (frame &&
/* We don't want to emit our first block as a RLE even if it qualifies because
* doing so will cause the decoder (cli only) to throw a "should consume all input error."
@@ -5825,6 +5829,13 @@ static size_t ZSTD_copySequencesToSeqStoreExplicitBlockDelim(ZSTD_CCtx* cctx, ZS
return 0;
}
static size_t ZSTD_convertBlockSequencesToSeqStore(ZSTD_CCtx* cctx,
const ZSTD_Sequence* inSeqs, size_t inSeqsSize,
const void* src, size_t srcSize) {
ZSTD_sequencePosition dummySeqPos = {0, 0, 0};
return ZSTD_copySequencesToSeqStoreExplicitBlockDelim(cctx, &dummySeqPos, inSeqs, inSeqsSize, src, srcSize);
}
/* Returns the number of bytes to move the current read position back by. Only non-zero
* if we ended up splitting a sequence. Otherwise, it may return a ZSTD error if something
* went wrong.