Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2227)

Unified Diff: third_party/libwebp/enc/cost.h

Issue 12942006: libwebp: update snapshot to v0.3.0-rc6 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libwebp/enc/config.c ('k') | third_party/libwebp/enc/cost.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libwebp/enc/cost.h
diff --git a/third_party/libwebp/enc/cost.h b/third_party/libwebp/enc/cost.h
index 4f55e2cc97cda8e2812e98cd64bcee8579d4851f..09b75b699d4ffa96f7f717265ea4bdd19fea5a5b 100644
--- a/third_party/libwebp/enc/cost.h
+++ b/third_party/libwebp/enc/cost.h
@@ -26,18 +26,12 @@ 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 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 WEBP_INLINE int VP8LevelCost(const uint16_t* const table, int level) {
return VP8LevelFixedCosts[level]
- + table[level > MAX_VARIABLE_LEVEL ? MAX_VARIABLE_LEVEL : level];
+ + table[(level > MAX_VARIABLE_LEVEL) ? MAX_VARIABLE_LEVEL : level];
}
// Mode costs
« no previous file with comments | « third_party/libwebp/enc/config.c ('k') | third_party/libwebp/enc/cost.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698