diff options
| author | James Zern <jzern@google.com> | 2018-01-11 19:59:28 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2018-01-17 20:38:46 +0000 |
| commit | a187300ff9a8a7c10b1fb2ec84223fdd14e6d47b (patch) | |
| tree | 6ff243c2fa83888c50ddbdfd9cfd401a71c0bf6f /src/enc/syntax_enc.c | |
| parent | 41b7acf653a14bf61375bbda10a77825ccc08e3b (diff) | |
| download | webp-a187300ff9a8a7c10b1fb2ec84223fdd14e6d47b.tar.gz | |
webp: update to v0.6.1
relevant entries from the NEWS file:
This is a binary compatible release.
* lossless performance and compression improvements + a new 'cruncher' mode
(-m 6 -q 100)
* ARM performance improvements with clang (15-20% w/ndk r15c, issue #339)
* miscellaneous bug & build fixes (issue #329, #332, #343, #353, #360, #361,
#363)
Test: aosp_arm-eng,aosp_arm64-eng,aosp_x86-eng,aosp_x86_64-eng,aosp_sailfish-userdebug build
Change-Id: I3f4d8b50e2d251ab69be21059d23ac8a983a990e
Diffstat (limited to 'src/enc/syntax_enc.c')
| -rw-r--r-- | src/enc/syntax_enc.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/enc/syntax_enc.c b/src/enc/syntax_enc.c index 90665bd7..a9e5a6cf 100644 --- a/src/enc/syntax_enc.c +++ b/src/enc/syntax_enc.c @@ -13,10 +13,10 @@ #include <assert.h> -#include "../utils/utils.h" -#include "../webp/format_constants.h" // RIFF constants -#include "../webp/mux_types.h" // ALPHA_FLAG -#include "./vp8i_enc.h" +#include "src/utils/utils.h" +#include "src/webp/format_constants.h" // RIFF constants +#include "src/webp/mux_types.h" // ALPHA_FLAG +#include "src/enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Helper functions @@ -289,11 +289,17 @@ static int GeneratePartition0(VP8Encoder* const enc) { pos3 = VP8BitWriterPos(bw); +#if !defined(WEBP_DISABLE_STATS) if (enc->pic_->stats) { enc->pic_->stats->header_bytes[0] = (int)((pos2 - pos1 + 7) >> 3); enc->pic_->stats->header_bytes[1] = (int)((pos3 - pos2 + 7) >> 3); enc->pic_->stats->alpha_data_size = (int)enc->alpha_data_size_; } +#else + (void)pos1; + (void)pos2; + (void)pos3; +#endif if (bw->error_) { return WebPEncodingSetError(enc->pic_, VP8_ENC_ERROR_OUT_OF_MEMORY); } |