dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-10-31 02:15:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add spatial prediction on top of palette in cruncher.

Browse Source 
Change-Id: I3765ab628ef915eedf2e541a80c65ce9880dff36
This commit is contained in:
Vincent Rabaud
2020-06-04 14:38:08 +02:00
parent 133ff0e374
commit 7658c68613
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/enc/vp8l_enc.c
View File

@@ -144,7 +144,8 @@ typedef enum {
kSubGreen = 2, kSubGreen = 2,
kSpatialSubGreen = 3, kSpatialSubGreen = 3,
kPalette = 4, kPalette = 4,
kNumEntropyIx = 5 kPaletteAndSpatial = 5,
kNumEntropyIx = 6
} EntropyIx; } EntropyIx;
typedef enum { typedef enum {
@@ -405,7 +406,10 @@ static int EncoderAnalyze(VP8LEncoder* const enc,
// Go brute force on all transforms. // Go brute force on all transforms.
*crunch_configs_size = 0; *crunch_configs_size = 0;
for (i = 0; i < kNumEntropyIx; ++i) { for (i = 0; i < kNumEntropyIx; ++i) {
if (i != kPalette || use_palette) { // We can only apply a spatial transform on top of palettization if the
// palette is full.
if ((i != kPalette && i != kPaletteAndSpatial) ||
(use_palette && (i == kPalette || enc->palette_size_ == 256))) {
assert(*crunch_configs_size < CRUNCH_CONFIGS_MAX); assert(*crunch_configs_size < CRUNCH_CONFIGS_MAX);
crunch_configs[(*crunch_configs_size)++].entropy_idx_ = i; crunch_configs[(*crunch_configs_size)++].entropy_idx_ = i;
} }
@@ -1553,11 +1557,13 @@ static int EncodeStreamHook(void* input, void* data2) {
for (idx = 0; idx < num_crunch_configs; ++idx) { for (idx = 0; idx < num_crunch_configs; ++idx) {
const int entropy_idx = crunch_configs[idx].entropy_idx_; const int entropy_idx = crunch_configs[idx].entropy_idx_;
enc->use_palette_ = (entropy_idx == kPalette); enc->use_palette_ =
(entropy_idx == kPalette) || (entropy_idx == kPaletteAndSpatial);
enc->use_subtract_green_ = enc->use_subtract_green_ =
(entropy_idx == kSubGreen) || (entropy_idx == kSpatialSubGreen); (entropy_idx == kSubGreen) || (entropy_idx == kSpatialSubGreen);
enc->use_predict_ = enc->use_predict_ = (entropy_idx == kSpatial) ||
(entropy_idx == kSpatial) || (entropy_idx == kSpatialSubGreen); (entropy_idx == kSpatialSubGreen) ||
(entropy_idx == kPaletteAndSpatial);
if (low_effort) { if (low_effort) {
enc->use_cross_color_ = 0; enc->use_cross_color_ = 0;
} else { } else {