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

Use palette only if we can in entropy analysis.

Browse Source 
Change-Id: I2be74b4d5fe48e059d5ced619d76fd030db79f74
This commit is contained in:
Vincent Rabaud 2017-02-28 11:43:13 +01:00
parent 75a9c3c452
commit a5e4e3aff1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/enc/vp8l_enc.c
View File

@ -292,7 +292,7 @@ static int AnalyzeEntropy(const uint32_t* argb,
// lower cost than sizeof(uint32_t)*8. // lower cost than sizeof(uint32_t)*8.
entropy[kPalette] += palette_size * 8; entropy[kPalette] += palette_size * 8;
if (entropy[kDirect] == 0) { if (use_palette && entropy[kDirect] == 0) {
// If the entropy is null, there should only be one color, // If the entropy is null, there should only be one color,
// and that case is handled at the very beginning of that function. // and that case is handled at the very beginning of that function.
// Unfortunately, we can also have a null entropy because we skip the // Unfortunately, we can also have a null entropy because we skip the
@ -308,6 +308,7 @@ static int AnalyzeEntropy(const uint32_t* argb,
} }
} }
} }
assert((int)*min_entropy_ix <= last_mode_to_analyze);
*red_and_blue_always_zero = 1; *red_and_blue_always_zero = 1;
// Let's check if the histogram of the chosen entropy mode has // Let's check if the histogram of the chosen entropy mode has
// non-zero red and blue values. If all are zero, we can later skip // non-zero red and blue values. If all are zero, we can later skip