dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-06 00:46:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not allow a color cache size bigger than the number of colors.

Browse Source 
This is purely for speed optimization.

Change-Id: Ie4b4380df8a5afa90574012bacdb1ddad03f320e
This commit is contained in:
Vincent Rabaud 2017-01-10 09:25:02 +01:00
parent ecff04f625
commit d712e20de0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/enc/vp8l.c
View File

@ -826,7 +826,13 @@ static WebPEncodingError EncodeImageInternal(VP8LBitWriter* const bw,
goto Error; goto Error;
} }
*cache_bits = use_cache ? MAX_COLOR_CACHE_BITS : 0; if (use_cache) {
// If the value is different from zero, it has been set during the
// palette analysis.
if (*cache_bits == 0) *cache_bits = MAX_COLOR_CACHE_BITS;
} else {
*cache_bits = 0;
}
// 'best_refs' is the reference to the best backward refs and points to one // 'best_refs' is the reference to the best backward refs and points to one
// of refs_array[0] or refs_array[1]. // of refs_array[0] or refs_array[1].
// Calculate backward references from ARGB image. // Calculate backward references from ARGB image.
@ -1500,6 +1506,10 @@ WebPEncodingError VP8LEncodeStream(const WebPConfig* const config,
if (err != VP8_ENC_OK) goto Error; if (err != VP8_ENC_OK) goto Error;
err = MapImageFromPalette(enc, use_delta_palettization); err = MapImageFromPalette(enc, use_delta_palettization);
if (err != VP8_ENC_OK) goto Error; if (err != VP8_ENC_OK) goto Error;
// If using a color cache, do not have it bigger than the number of colors.
if (use_cache && enc->palette_size_ < (1 << MAX_COLOR_CACHE_BITS)) {
enc->cache_bits_ = BitsLog2Floor(enc->palette_size_) + 1;
}
} }
if (!use_delta_palettization) { if (!use_delta_palettization) {
// In case image is not packed. // In case image is not packed.