Index: third_party/libwebp/enc/cost.h |
diff --git a/third_party/libwebp/enc/cost.h b/third_party/libwebp/enc/cost.h |
index 4e558952123bd9ed80e8718a26b345b211b35ffc..20960d6d74c0283688eefde24b3dae7dd62f57b1 100644 |
--- a/third_party/libwebp/enc/cost.h |
+++ b/third_party/libwebp/enc/cost.h |
@@ -24,46 +24,31 @@ extern "C" { |
// On-the-fly info about the current set of residuals. Handy to avoid |
// passing zillions of params. |
-typedef struct { |
+typedef struct VP8Residual VP8Residual; |
+struct VP8Residual { |
int first; |
int last; |
const int16_t* coeffs; |
int coeff_type; |
- ProbaArray* prob; |
- StatsArray* stats; |
- CostArray* cost; |
-} VP8Residual; |
+ ProbaArray* prob; |
+ StatsArray* stats; |
+ CostArrayPtr costs; |
+}; |
void VP8InitResidual(int first, int coeff_type, |
VP8Encoder* const enc, VP8Residual* const res); |
-typedef void (*VP8SetResidualCoeffsFunc)(const int16_t* const coeffs, |
- VP8Residual* const res); |
-extern VP8SetResidualCoeffsFunc VP8SetResidualCoeffs; |
- |
-void VP8SetResidualCoeffsInit(void); // must be called first |
- |
int VP8RecordCoeffs(int ctx, const VP8Residual* const res); |
-// approximate cost per level: |
-extern const uint16_t VP8LevelFixedCosts[MAX_LEVEL + 1]; |
-extern const uint16_t VP8EntropyCost[256]; // 8bit fixed-point log(p) |
- |
// Cost of coding one event with probability 'proba'. |
static WEBP_INLINE int VP8BitCost(int bit, uint8_t proba) { |
return !bit ? VP8EntropyCost[proba] : VP8EntropyCost[255 - proba]; |
} |
-// Cost calculation function. |
-typedef int (*VP8GetResidualCostFunc)(int ctx0, const VP8Residual* const res); |
-extern VP8GetResidualCostFunc VP8GetResidualCost; |
- |
-void VP8GetResidualCostInit(void); // must be called first |
- |
// Level cost calculations |
extern const uint16_t VP8LevelCodes[MAX_VARIABLE_LEVEL][2]; |
-void VP8CalculateLevelCosts(VP8Proba* const proba); |
+void VP8CalculateLevelCosts(VP8EncProba* const proba); |
static WEBP_INLINE int VP8LevelCost(const uint16_t* const table, int level) { |
return VP8LevelFixedCosts[level] |
+ table[(level > MAX_VARIABLE_LEVEL) ? MAX_VARIABLE_LEVEL : level]; |