dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-30 15:28:23 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

histogram.c: reindent after b33e8a0

Browse Source 
b33e8a0 Refactor code for HistogramCombine.

Change-Id: Ia1b4b545c5f4e29cc897339df2b58f18f83c15b3
This commit is contained in:
James Zern 2014-03-04 00:38:14 -08:00
parent 06d456f685
commit 687a58ecc3
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/enc/histogram.c
View File

@ -179,25 +179,25 @@ static WEBP_INLINE double InitialHuffmanCost(void) {
static const int kHuffmanCodeOfHuffmanCodeSize = CODE_LENGTH_CODES * 3; static const int kHuffmanCodeOfHuffmanCodeSize = CODE_LENGTH_CODES * 3;
static const double kSmallBias = 9.1; static const double kSmallBias = 9.1;
return kHuffmanCodeOfHuffmanCodeSize - kSmallBias; return kHuffmanCodeOfHuffmanCodeSize - kSmallBias;
} }
static WEBP_INLINE double HuffmanCostRefine(int streak, int val) { static WEBP_INLINE double HuffmanCostRefine(int streak, int val) {
double retval; double retval;
if (streak > 3) { if (streak > 3) {
if (val == 0) { if (val == 0) {
retval = 1.5625 + 0.234375 * streak; retval = 1.5625 + 0.234375 * streak;
} else {
retval = 2.578125 + 0.703125 * streak;
}
} else { } else {
retval = 2.578125 + 0.703125 * streak;
}
} else {
if (val == 0) { if (val == 0) {
retval = 1.796875 * streak; retval = 1.796875 * streak;
} else { } else {
retval = 3.28125 * streak; retval = 3.28125 * streak;
} }
} }
return retval; return retval;
} }
// Returns the cost encode the rle-encoded entropy code. // Returns the cost encode the rle-encoded entropy code.
// The constants in this function are experimental. // The constants in this function are experimental.
@ -268,23 +268,23 @@ static double ExtraCostCombined(const int* const X, const int* const Y,
double VP8LHistogramEstimateBits(const VP8LHistogram* const p) { double VP8LHistogramEstimateBits(const VP8LHistogram* const p) {
return return
PopulationCost(p->literal_, VP8LHistogramNumCodes(p->palette_code_bits_)) PopulationCost(p->literal_, VP8LHistogramNumCodes(p->palette_code_bits_))
+ PopulationCost(p->red_, 256) + PopulationCost(p->red_, 256)
+ PopulationCost(p->blue_, 256) + PopulationCost(p->blue_, 256)
+ PopulationCost(p->alpha_, 256) + PopulationCost(p->alpha_, 256)
+ PopulationCost(p->distance_, NUM_DISTANCE_CODES) + PopulationCost(p->distance_, NUM_DISTANCE_CODES)
+ ExtraCost(p->literal_ + 256, NUM_LENGTH_CODES) + ExtraCost(p->literal_ + 256, NUM_LENGTH_CODES)
+ ExtraCost(p->distance_, NUM_DISTANCE_CODES); + ExtraCost(p->distance_, NUM_DISTANCE_CODES);
} }
double VP8LHistogramEstimateBitsBulk(const VP8LHistogram* const p) { double VP8LHistogramEstimateBitsBulk(const VP8LHistogram* const p) {
return return
BitsEntropy(p->literal_, VP8LHistogramNumCodes(p->palette_code_bits_)) BitsEntropy(p->literal_, VP8LHistogramNumCodes(p->palette_code_bits_))
+ BitsEntropy(p->red_, 256) + BitsEntropy(p->red_, 256)
+ BitsEntropy(p->blue_, 256) + BitsEntropy(p->blue_, 256)
+ BitsEntropy(p->alpha_, 256) + BitsEntropy(p->alpha_, 256)
+ BitsEntropy(p->distance_, NUM_DISTANCE_CODES) + BitsEntropy(p->distance_, NUM_DISTANCE_CODES)
+ ExtraCost(p->literal_ + 256, NUM_LENGTH_CODES) + ExtraCost(p->literal_ + 256, NUM_LENGTH_CODES)
+ ExtraCost(p->distance_, NUM_DISTANCE_CODES); + ExtraCost(p->distance_, NUM_DISTANCE_CODES);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -352,12 +352,12 @@ static double HistogramAddEval(const VP8LHistogram* const a,
cost_threshold += sum_cost; cost_threshold += sum_cost;
if (GetCombinedHistogramEntropy(a, b, cost_threshold, &cost)) { if (GetCombinedHistogramEntropy(a, b, cost_threshold, &cost)) {
for (i = 0; i < PIX_OR_COPY_CODES_MAX; ++i) { for (i = 0; i < PIX_OR_COPY_CODES_MAX; ++i) {
out->literal_[i] = a->literal_[i] + b->literal_[i]; out->literal_[i] = a->literal_[i] + b->literal_[i];
} }
for (i = 0; i < NUM_DISTANCE_CODES; ++i) { for (i = 0; i < NUM_DISTANCE_CODES; ++i) {
out->distance_[i] = a->distance_[i] + b->distance_[i]; out->distance_[i] = a->distance_[i] + b->distance_[i];
} }
for (i = 0; i < 256; ++i) { for (i = 0; i < 256; ++i) {
out->red_[i] = a->red_[i] + b->red_[i]; out->red_[i] = a->red_[i] + b->red_[i];
out->blue_[i] = a->blue_[i] + b->blue_[i]; out->blue_[i] = a->blue_[i] + b->blue_[i];
@ -365,7 +365,7 @@ static double HistogramAddEval(const VP8LHistogram* const a,
} }
out->palette_code_bits_ = (a->palette_code_bits_ > b->palette_code_bits_) ? out->palette_code_bits_ = (a->palette_code_bits_ > b->palette_code_bits_) ?
a->palette_code_bits_ : b->palette_code_bits_; a->palette_code_bits_ : b->palette_code_bits_;
out->bit_cost_ = cost; out->bit_cost_ = cost;
} }
return cost - sum_cost; return cost - sum_cost;