AuroraMiddleware/lz4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make LZ4F_getBlockSize public and publis in experimental section

Browse Source
This commit is contained in:
Tim Zakian 2019-01-09 10:49:49 -08:00
parent d6eac9c5cf
commit 8193742251
3 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/lz4frame.c
View File

@ -265,22 +265,21 @@ unsigned LZ4F_getVersion(void) { return LZ4F_VERSION; }
int LZ4F_compressionLevel_max(void) { return LZ4HC_CLEVEL_MAX; } int LZ4F_compressionLevel_max(void) { return LZ4HC_CLEVEL_MAX; }
size_t LZ4F_getBlockSize(unsigned blockSizeID)
{
static const size_t blockSizes[4] = { 64 KB, 256 KB, 1 MB, 4 MB };
if (blockSizeID == 0) blockSizeID = LZ4F_BLOCKSIZEID_DEFAULT;
if (blockSizeID < 4 || blockSizeID > 7) return err0r(LZ4F_ERROR_maxBlockSize_invalid);
blockSizeID -= 4;
return blockSizes[blockSizeID];
}
/*-************************************ /*-************************************
* Private functions * Private functions
**************************************/ **************************************/
#define MIN(a,b) ( (a) < (b) ? (a) : (b) ) #define MIN(a,b) ( (a) < (b) ? (a) : (b) )
static size_t LZ4F_getBlockSize(unsigned blockSizeID)
{
static const size_t blockSizes[4] = { 64 KB, 256 KB, 1 MB, 4 MB };
if (blockSizeID == 0) blockSizeID = LZ4F_BLOCKSIZEID_DEFAULT;
blockSizeID -= 4;
if (blockSizeID > 3) return err0r(LZ4F_ERROR_maxBlockSize_invalid);
return blockSizes[blockSizeID];
}
static BYTE LZ4F_headerChecksum (const void* header, size_t length) static BYTE LZ4F_headerChecksum (const void* header, size_t length)
{ {
U32 const xxh = XXH32(header, length, 0); U32 const xxh = XXH32(header, length, 0);

1
lib/lz4frame.h
View File

@ -483,6 +483,7 @@ typedef enum { LZ4F_LIST_ERRORS(LZ4F_GENERATE_ENUM)
LZ4FLIB_STATIC_API LZ4F_errorCodes LZ4F_getErrorCode(size_t functionResult); LZ4FLIB_STATIC_API LZ4F_errorCodes LZ4F_getErrorCode(size_t functionResult);
LZ4FLIB_STATIC_API size_t LZ4F_getBlockSize(unsigned);
/********************************** /**********************************
* Bulk processing dictionary API * Bulk processing dictionary API

22
tests/frametest.c
View File

@ -658,6 +658,28 @@ int basicTests(U32 seed, double compressibility)
CHECK( LZ4F_freeCompressionContext(cctx) ); cctx = NULL; CHECK( LZ4F_freeCompressionContext(cctx) ); cctx = NULL;
} }
DISPLAYLEVEL(3, "getBlockSize test: \n");
{ size_t result;
for (unsigned blockSizeID = 4; blockSizeID < 8; ++blockSizeID) {
result = LZ4F_getBlockSize(blockSizeID);
CHECK(result);
DISPLAYLEVEL(3, "Returned block size of %zu bytes for blockID %u \n",
result, blockSizeID);
}
/* Test an invalid input that's too large */
result = LZ4F_getBlockSize(8);
if(!LZ4F_isError(result) ||
LZ4F_getErrorCode(result) != LZ4F_ERROR_maxBlockSize_invalid)
goto _output_error;
/* Test an invalid input that's too small */
result = LZ4F_getBlockSize(3);
if(!LZ4F_isError(result) ||
LZ4F_getErrorCode(result) != LZ4F_ERROR_maxBlockSize_invalid)
goto _output_error;
}
DISPLAYLEVEL(3, "Skippable frame test : \n"); DISPLAYLEVEL(3, "Skippable frame test : \n");
{ size_t decodedBufferSize = COMPRESSIBLE_NOISE_LENGTH; { size_t decodedBufferSize = COMPRESSIBLE_NOISE_LENGTH;