AuroraMiddleware/brotli
1
0
Fork 0
mirror of https://github.com/google/brotli.git synced 2025-01-16 11:14:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix storing of the meta-block header for last empty meta-block.

Browse Source
This commit is contained in:
Zoltan Szabadka 2014-10-28 12:09:18 +01:00
parent 618ea06821
commit ca8c2890aa
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
enc/brotli_bit_stream.cc
View File

@ -51,19 +51,31 @@ void StoreVarLenUint8(int n, int* storage_ix, uint8_t* storage) {
}
}
void StoreCompressedMetaBlockHeader(bool final_block,
bool StoreCompressedMetaBlockHeader(bool final_block,
int length,
int* storage_ix,
uint8_t* storage) {
// Write ISLAST bit.
WriteBits(1, final_block, storage_ix, storage);
// Write ISEMPTY bit.
if (final_block) WriteBits(1, length == 0, storage_ix, storage);
if (final_block) {
WriteBits(1, length == 0, storage_ix, storage);
if (length == 0) {
return true;
}
}
if (length == 0) {
// Only the last meta-block can be empty.
return false;
}
int lenbits;
int nlenbits;
int nibblesbits;
EncodeMlen(length, &lenbits, &nlenbits, &nibblesbits);
if (!EncodeMlen(length, &lenbits, &nlenbits, &nibblesbits)) {
return false;
}
WriteBits(2, nibblesbits, storage_ix, storage);
WriteBits(nlenbits, lenbits, storage_ix, storage);
@ -72,9 +84,10 @@ void StoreCompressedMetaBlockHeader(bool final_block,
// Write ISUNCOMPRESSED bit.
WriteBits(1, 0, storage_ix, storage);
}
return true;
}
void StoreUncompressedMetaBlockHeader(int length,
bool StoreUncompressedMetaBlockHeader(int length,
int* storage_ix,
uint8_t* storage) {
// Write ISLAST bit. Uncompressed block cannot be the last one, so set to 0.
@ -82,11 +95,14 @@ void StoreUncompressedMetaBlockHeader(int length,
int lenbits;
int nlenbits;
int nibblesbits;
EncodeMlen(length, &lenbits, &nlenbits, &nibblesbits);
if (!EncodeMlen(length, &lenbits, &nlenbits, &nibblesbits)) {
return false;
}
WriteBits(2, nibblesbits, storage_ix, storage);
WriteBits(nlenbits, lenbits, storage_ix, storage);
// Write ISUNCOMPRESSED bit.
WriteBits(1, 1, storage_ix, storage);
return true;
}
void StoreHuffmanTreeOfHuffmanTreeToBitMask(

4
enc/brotli_bit_stream.h
View File

@ -37,13 +37,13 @@ namespace brotli {
void StoreVarLenUint8(int n, int* storage_ix, uint8_t* storage);
// Stores the compressed meta-block header.
void StoreCompressedMetaBlockHeader(bool final_block,
bool StoreCompressedMetaBlockHeader(bool final_block,
int length,
int* storage_ix,
uint8_t* storage);
// Stores the uncompressed meta-block header.
void StoreUncompressedMetaBlockHeader(int length,
bool StoreUncompressedMetaBlockHeader(int length,
int* storage_ix,
uint8_t* storage);