aboutsummaryrefslogtreecommitdiff
path: root/src/utils/bit_reader_utils.h
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2018-01-11 19:59:28 -0800
committerJames Zern <jzern@google.com>2018-01-17 20:38:46 +0000
commita187300ff9a8a7c10b1fb2ec84223fdd14e6d47b (patch)
tree6ff243c2fa83888c50ddbdfd9cfd401a71c0bf6f /src/utils/bit_reader_utils.h
parent41b7acf653a14bf61375bbda10a77825ccc08e3b (diff)
downloadwebp-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/utils/bit_reader_utils.h')
-rw-r--r--src/utils/bit_reader_utils.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/utils/bit_reader_utils.h b/src/utils/bit_reader_utils.h
index ec3426cd..317d311c 100644
--- a/src/utils/bit_reader_utils.h
+++ b/src/utils/bit_reader_utils.h
@@ -12,14 +12,14 @@
// Author: Skal (pascal.massimino@gmail.com)
// Vikas Arora (vikaas.arora@gmail.com)
-#ifndef WEBP_UTILS_BIT_READER_H_
-#define WEBP_UTILS_BIT_READER_H_
+#ifndef WEBP_UTILS_BIT_READER_UTILS_H_
+#define WEBP_UTILS_BIT_READER_UTILS_H_
#include <assert.h>
#ifdef _MSC_VER
#include <stdlib.h> // _byteswap_ulong
#endif
-#include "../webp/types.h"
+#include "src/webp/types.h"
#ifdef __cplusplus
extern "C" {
@@ -155,9 +155,10 @@ static WEBP_INLINE int VP8LIsEndOfStream(const VP8LBitReader* const br) {
// For jumping over a number of bits in the bit stream when accessed with
// VP8LPrefetchBits and VP8LFillBitWindow.
+// This function does *not* set br->eos_, since it's speed-critical.
+// Use with extreme care!
static WEBP_INLINE void VP8LSetBitPos(VP8LBitReader* const br, int val) {
br->bit_pos_ = val;
- br->eos_ = VP8LIsEndOfStream(br);
}
// Advances the read buffer by 4 bytes to make room for reading next 32 bits.
@@ -171,4 +172,4 @@ static WEBP_INLINE void VP8LFillBitWindow(VP8LBitReader* const br) {
} // extern "C"
#endif
-#endif /* WEBP_UTILS_BIT_READER_H_ */
+#endif /* WEBP_UTILS_BIT_READER_UTILS_H_ */