diff options
author | James Zern <jzern@google.com> | 2020-09-11 11:00:21 -0700 |
---|---|---|
committer | James Zern <jzern@google.com> | 2020-09-11 12:03:56 -0700 |
commit | 5fa5b223c34bbd4f3e50b89eedf9e6dfdaec4552 (patch) | |
tree | 212ce09120f7b160b4478bb9c48f675fd4260ed8 /src/enc/backward_references_enc.h | |
parent | 11a425334925b8ffe84a8233ce342c9a48c96ffc (diff) | |
download | webp-5fa5b223c34bbd4f3e50b89eedf9e6dfdaec4552.tar.gz |
external/webp: update to v1.1.0-28-g55a080e5
picks up a couple ubsan fixes
24 commits:
https://chromium.googlesource.com/webm/libwebp/+log/0fa56f3..55a080
Bug: skia:10693
Test: builds for aosp_arm-eng aosp_arm64-eng aosp_x86-eng aosp_x86_64-eng aosp_crosshatch-userdebug
Change-Id: I0f1afe1b6abf6b11c28e81938cfcaf9d772fc7b0
Diffstat (limited to 'src/enc/backward_references_enc.h')
-rw-r--r-- | src/enc/backward_references_enc.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/enc/backward_references_enc.h b/src/enc/backward_references_enc.h index 103ddfdc..4c0267b4 100644 --- a/src/enc/backward_references_enc.h +++ b/src/enc/backward_references_enc.h @@ -16,6 +16,7 @@ #include <assert.h> #include <stdlib.h> #include "src/webp/types.h" +#include "src/webp/encode.h" #include "src/webp/format_constants.h" #ifdef __cplusplus @@ -218,14 +219,19 @@ enum VP8LLZ77Type { // Evaluates best possible backward references for specified quality. // The input cache_bits to 'VP8LGetBackwardReferences' sets the maximum cache // bits to use (passing 0 implies disabling the local color cache). -// The optimal cache bits is evaluated and set for the *cache_bits parameter. -// The return value is the pointer to the best of the two backward refs viz, -// refs[0] or refs[1]. -VP8LBackwardRefs* VP8LGetBackwardReferences( +// The optimal cache bits is evaluated and set for the *cache_bits_best +// parameter with the matching refs_best. +// If do_no_cache == 0, refs is an array of 2 values and the best +// VP8LBackwardRefs is put in the first element. +// If do_no_cache != 0, refs is an array of 3 values and the best +// VP8LBackwardRefs is put in the first element, the best value with no-cache in +// the second element. +// In both cases, the last element is used as temporary internally. +WebPEncodingError VP8LGetBackwardReferences( int width, int height, const uint32_t* const argb, int quality, - int low_effort, int lz77_types_to_try, int* const cache_bits, - const VP8LHashChain* const hash_chain, VP8LBackwardRefs* const refs_tmp1, - VP8LBackwardRefs* const refs_tmp2); + int low_effort, int lz77_types_to_try, int cache_bits_max, int do_no_cache, + const VP8LHashChain* const hash_chain, VP8LBackwardRefs* const refs, + int* const cache_bits_best); #ifdef __cplusplus } |