dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-26 13:48:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

80 cols fix

Browse Source
This commit is contained in:
Pascal Massimino 2011-06-20 15:38:14 -07:00
parent bd2f65f67c
commit f4c4e416c0
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/enc/cost.h
View File

@ -27,7 +27,8 @@ static inline int VP8BitCost(int bit, uint8_t proba) {
} }
// Cost of coding 'nb' 1's and 'total-nb' 0's using 'proba' probability. // 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 inline uint64_t VP8BranchCost(uint64_t nb, uint64_t total,
uint8_t proba) {
return nb * VP8BitCost(1, proba) + (total - nb) * VP8BitCost(0, proba); return nb * VP8BitCost(1, proba) + (total - nb) * VP8BitCost(0, proba);
} }

3
src/enc/iterator.c
View File

@ -216,7 +216,8 @@ void VP8IteratorBytesToNz(VP8EncIterator* const it) {
nz |= (it->top_nz_[6] << 22) | (it->top_nz_[7] << 23); nz |= (it->top_nz_[6] << 22) | (it->top_nz_[7] << 23);
nz |= (it->top_nz_[8] << 24); // we propagate the _top_ bit, esp. for intra4 nz |= (it->top_nz_[8] << 24); // we propagate the _top_ bit, esp. for intra4
// left // left
nz |= (it->left_nz_[0] << 3) | (it->left_nz_[1] << 7) | (it->left_nz_[2] << 11); nz |= (it->left_nz_[0] << 3) | (it->left_nz_[1] << 7);
nz |= (it->left_nz_[2] << 11);
nz |= (it->left_nz_[4] << 17) | (it->left_nz_[6] << 21); nz |= (it->left_nz_[4] << 17) | (it->left_nz_[6] << 21);
*it->nz_ = nz; *it->nz_ = nz;

2
src/enc/picture.c
View File

@ -242,7 +242,7 @@ static inline void ImportRow(const uint8_t* src, int src_width,
const int32_t base = src[x_in++]; const int32_t base = src[x_in++];
const int32_t frac = base * (-x_accum); const int32_t frac = base * (-x_accum);
frow[x_out] = (sum + base) * dst_width - frac; frow[x_out] = (sum + base) * dst_width - frac;
sum = MULT(frac, fx_scale); // fresh fractional start for next pixel sum = MULT(frac, fx_scale); // fresh fractional start for next pixel
} }
} }
} else { // simple bilinear interpolation } else { // simple bilinear interpolation

2
src/enc/vp8enci.h
View File

@ -261,7 +261,7 @@ typedef struct {
uint8_t* preds_; // intra mode predictors (4x4 blocks) uint8_t* preds_; // intra mode predictors (4x4 blocks)
uint32_t* nz_; // non-zero pattern uint32_t* nz_; // non-zero pattern
uint8_t i4_boundary_[37]; // 32+5 boundary samples needed by intra4x4 uint8_t i4_boundary_[37]; // 32+5 boundary samples needed by intra4x4
uint8_t* i4_top_; // pointer to the current *top boundary sample uint8_t* i4_top_; // pointer to the current top boundary sample
int i4_; // current intra4x4 mode being tested int i4_; // current intra4x4 mode being tested
int top_nz_[9]; // top-non-zero context. int top_nz_[9]; // top-non-zero context.
int left_nz_[9]; // left-non-zero. left_nz[8] is independent. int left_nz_[9]; // left-non-zero. left_nz[8] is independent.