Index: third_party/libwebp/enc/cost.h |
diff --git a/third_party/libwebp/enc/cost.h b/third_party/libwebp/enc/cost.h |
index 4b00c85bb1608ad934cfe38f4d10b9bbf18113fc..4f55e2cc97cda8e2812e98cd64bcee8579d4851f 100644 |
--- a/third_party/libwebp/enc/cost.h |
+++ b/third_party/libwebp/enc/cost.h |
@@ -1,4 +1,4 @@ |
-// Copyright 2011 Google Inc. |
+// Copyright 2011 Google Inc. All Rights Reserved. |
// |
// This code is licensed under the same terms as WebM: |
// Software License Agreement: http://www.webmproject.org/license/software/ |
@@ -12,7 +12,7 @@ |
#ifndef WEBP_ENC_COST_H_ |
#define WEBP_ENC_COST_H_ |
-#include "vp8enci.h" |
+#include "./vp8enci.h" |
#if defined(__cplusplus) || defined(c_plusplus) |
extern "C" { |
@@ -22,20 +22,20 @@ extern const uint16_t VP8LevelFixedCosts[2048]; // approximate cost per level |
extern const uint16_t VP8EntropyCost[256]; // 8bit fixed-point log(p) |
// Cost of coding one event with probability 'proba'. |
-static inline int VP8BitCost(int bit, uint8_t proba) { |
+static WEBP_INLINE int VP8BitCost(int bit, uint8_t proba) { |
return !bit ? VP8EntropyCost[proba] : VP8EntropyCost[255 - proba]; |
} |
// Cost of coding 'nb' 1's and 'total-nb' 0's using 'proba' probability. |
-static inline uint64_t VP8BranchCost(uint64_t nb, uint64_t total, |
- uint8_t proba) { |
+static WEBP_INLINE uint64_t VP8BranchCost(uint64_t nb, uint64_t total, |
+ uint8_t proba) { |
return nb * VP8BitCost(1, proba) + (total - nb) * VP8BitCost(0, proba); |
} |
// Level cost calculations |
extern const uint16_t VP8LevelCodes[MAX_VARIABLE_LEVEL][2]; |
void VP8CalculateLevelCosts(VP8Proba* const proba); |
-static inline int VP8LevelCost(const uint16_t* const table, int level) { |
+static WEBP_INLINE int VP8LevelCost(const uint16_t* const table, int level) { |
return VP8LevelFixedCosts[level] |
+ table[level > MAX_VARIABLE_LEVEL ? MAX_VARIABLE_LEVEL : level]; |
} |