5b42ae09ae
Prior to this change, VP8 min quantizer is 4, which caps the highest quality around 51DB. This experimental change extends the min quantizer to 1, removes the cap and allows the highest quality to be around ~73DB, consistent with the fdct/idct round trip error. To test this change, at configure time use options: --enable-experimental --enable-extend_qrange The following is a brief log of changes in each of the patch sets patch set 1: In this commit, the quantization/dequantization constants are kept unchanged, instead scaling factor 4 is rolled into fdct/idct. Fixed Q0 encoding tests on mobile: Before: 9560.567kbps Overall PSNR:50.255DB VPXSSIM:98.288 Now: 18035.774kbps Overall PSNR:73.022DB VPXSSIM:99.991 patch set 2: regenerated dc/ac quantizer lookup tables based on the scaling factor rolled in the fdct/idct. Also slightly extended the range towards the high quantizer end. patch set 3: slightly tweaked the quantizer tables and generated bits_per_mb table based on Paul's suggestions. patch set 4: fix a typo in idct, re-calculated tables relating active max Q to active min Q patch set 5: added rdmult lookup table based on Q patch set 6: fix rdmult scale: dct coefficient has scaled up by 4 patch set 7: make transform coefficients to be within 16bits patch set 8: normalize 2nd order quantizers patch set 9: fix mis-spellings patch set 10: change the configure script and macros to allow experimental code to be enabled at configure time with --enable-extend_qrange patch set 11: rebase for merge Change-Id: Ib50641ddd44aba2a52ed890222c309faa31cc59c
139 lines
3.1 KiB
C
139 lines
3.1 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#include <math.h>
|
|
#include "vpx_ports/config.h"
|
|
void vp8_short_fdct4x4_c(short *input, short *output, int pitch)
|
|
{
|
|
int i;
|
|
int a1, b1, c1, d1;
|
|
short *ip = input;
|
|
short *op = output;
|
|
|
|
for (i = 0; i < 4; i++)
|
|
{
|
|
#if CONFIG_EXTEND_QRANGE
|
|
a1 = ((ip[0] + ip[3])<<5);
|
|
b1 = ((ip[1] + ip[2])<<5);
|
|
c1 = ((ip[1] - ip[2])<<5);
|
|
d1 = ((ip[0] - ip[3])<<5);
|
|
#else
|
|
a1 = ((ip[0] + ip[3])<<3);
|
|
b1 = ((ip[1] + ip[2])<<3);
|
|
c1 = ((ip[1] - ip[2])<<3);
|
|
d1 = ((ip[0] - ip[3])<<3);
|
|
#endif
|
|
op[0] = a1 + b1;
|
|
op[2] = a1 - b1;
|
|
|
|
op[1] = (c1 * 2217 + d1 * 5352 + 14500)>>12;
|
|
op[3] = (d1 * 2217 - c1 * 5352 + 7500)>>12;
|
|
|
|
ip += pitch / 2;
|
|
op += 4;
|
|
|
|
}
|
|
ip = output;
|
|
op = output;
|
|
for (i = 0; i < 4; i++)
|
|
{
|
|
a1 = ip[0] + ip[12];
|
|
b1 = ip[4] + ip[8];
|
|
c1 = ip[4] - ip[8];
|
|
d1 = ip[0] - ip[12];
|
|
|
|
op[0] = ( a1 + b1 + 7)>>4;
|
|
op[8] = ( a1 - b1 + 7)>>4;
|
|
|
|
op[4] =((c1 * 2217 + d1 * 5352 + 12000)>>16) + (d1!=0);
|
|
op[12] = (d1 * 2217 - c1 * 5352 + 51000)>>16;
|
|
|
|
ip++;
|
|
op++;
|
|
}
|
|
}
|
|
|
|
void vp8_short_fdct8x4_c(short *input, short *output, int pitch)
|
|
{
|
|
vp8_short_fdct4x4_c(input, output, pitch);
|
|
vp8_short_fdct4x4_c(input + 4, output + 16, pitch);
|
|
}
|
|
|
|
void vp8_short_walsh4x4_c(short *input, short *output, int pitch)
|
|
{
|
|
int i;
|
|
int a1, b1, c1, d1;
|
|
int a2, b2, c2, d2;
|
|
short *ip = input;
|
|
short *op = output;
|
|
|
|
|
|
for (i = 0; i < 4; i++)
|
|
{
|
|
#if !CONFIG_EXTEND_QRANGE
|
|
a1 = ((ip[0] + ip[2])<<2);
|
|
d1 = ((ip[1] + ip[3])<<2);
|
|
c1 = ((ip[1] - ip[3])<<2);
|
|
b1 = ((ip[0] - ip[2])<<2);
|
|
|
|
op[0] = a1 + d1 + (a1!=0);
|
|
#else
|
|
a1 = ((ip[0] + ip[2]));
|
|
d1 = ((ip[1] + ip[3]));
|
|
c1 = ((ip[1] - ip[3]));
|
|
b1 = ((ip[0] - ip[2]));
|
|
|
|
|
|
op[0] = a1 + d1;
|
|
#endif
|
|
op[1] = b1 + c1;
|
|
op[2] = b1 - c1;
|
|
op[3] = a1 - d1;
|
|
ip += pitch / 2;
|
|
op += 4;
|
|
}
|
|
|
|
ip = output;
|
|
op = output;
|
|
|
|
for (i = 0; i < 4; i++)
|
|
{
|
|
a1 = ip[0] + ip[8];
|
|
d1 = ip[4] + ip[12];
|
|
c1 = ip[4] - ip[12];
|
|
b1 = ip[0] - ip[8];
|
|
|
|
a2 = a1 + d1;
|
|
b2 = b1 + c1;
|
|
c2 = b1 - c1;
|
|
d2 = a1 - d1;
|
|
|
|
a2 += a2<0;
|
|
b2 += b2<0;
|
|
c2 += c2<0;
|
|
d2 += d2<0;
|
|
|
|
#if !CONFIG_EXTEND_QRANGE
|
|
op[0] = (a2+3) >> 3;
|
|
op[4] = (b2+3) >> 3;
|
|
op[8] = (c2+3) >> 3;
|
|
op[12]= (d2+3) >> 3;
|
|
#else
|
|
op[0] = (a2+1) >> 2;
|
|
op[4] = (b2+1) >> 2;
|
|
op[8] = (c2+1) >> 2;
|
|
op[12]= (d2+1) >> 2;
|
|
#endif
|
|
ip++;
|
|
op++;
|
|
}
|
|
}
|