generic-library/webp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only compute quantization params once

Browse Source 
(all quantization params #1..#15 are the same)

Change-Id: If04058bd89fe2677b5b118ee4e1bcce88f0e4bf5
This commit is contained in:
skal
2013-12-10 05:36:23 +01:00
parent d513bb62bc
commit a3359f5d2c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/enc/quant.c
View File

@@ -188,12 +188,8 @@ static const uint8_t kFreqSharpening[16] = {
// Returns the average quantizer // Returns the average quantizer
static int ExpandMatrix(VP8Matrix* const m, int type) { static int ExpandMatrix(VP8Matrix* const m, int type) {
int i; int i, sum;
int sum = 0; for (i = 0; i < 2; ++i) {
for (i = 2; i < 16; ++i) {
m->q_[i] = m->q_[1];
}
for (i = 0; i < 16; ++i) {
const int is_ac_coeff = (i > 0); const int is_ac_coeff = (i > 0);
const int bias = kBiasMatrices[type][is_ac_coeff]; const int bias = kBiasMatrices[type][is_ac_coeff];
m->iq_[i] = (1 << QFIX) / m->q_[i]; m->iq_[i] = (1 << QFIX) / m->q_[i];
@@ -202,6 +198,14 @@ static int ExpandMatrix(VP8Matrix* const m, int type) {
// * zero if coeff <= zthresh // * zero if coeff <= zthresh
// * non-zero if coeff > zthresh // * non-zero if coeff > zthresh
m->zthresh_[i] = ((1 << QFIX) - 1 - m->bias_[i]) / m->iq_[i]; m->zthresh_[i] = ((1 << QFIX) - 1 - m->bias_[i]) / m->iq_[i];
}
for (i = 2; i < 16; ++i) {
m->q_[i] = m->q_[1];
m->iq_[i] = m->iq_[1];
m->bias_[i] = m->bias_[1];
m->zthresh_[i] = m->zthresh_[1];
}
for (sum = 0, i = 0; i < 16; ++i) {
if (type == 0) { // we only use sharpening for AC luma coeffs if (type == 0) { // we only use sharpening for AC luma coeffs
m->sharpen_[i] = (kFreqSharpening[i] * m->q_[i]) >> SHARPEN_BITS; m->sharpen_[i] = (kFreqSharpening[i] * m->q_[i]) >> SHARPEN_BITS;
} else { } else {