2010-05-18 17:58:33 +02:00
|
|
|
/*
|
2010-09-09 14:16:39 +02:00
|
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
2010-05-18 17:58:33 +02:00
|
|
|
*
|
2010-06-18 18:39:21 +02:00
|
|
|
* Use of this source code is governed by a BSD-style license
|
2010-06-04 22:19:40 +02:00
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
2010-06-18 18:39:21 +02:00
|
|
|
* in the file PATENTS. All contributing project authors may
|
2010-06-04 22:19:40 +02:00
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
2010-05-18 17:58:33 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2011-09-15 14:34:12 +02:00
|
|
|
#include "vpx_config.h"
|
2012-01-13 01:55:44 +01:00
|
|
|
#include "vpx_rtcd.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "encodemb.h"
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/reconinter.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "quantize.h"
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
#include "tokenize.h"
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/invtrans.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "vpx_mem/vpx_mem.h"
|
2011-04-07 22:57:25 +02:00
|
|
|
#include "rdopt.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
void vp8_subtract_b_c(BLOCK *be, BLOCKD *bd, int pitch)
|
|
|
|
{
|
|
|
|
unsigned char *src_ptr = (*(be->base_src) + be->src);
|
|
|
|
short *diff_ptr = be->src_diff;
|
|
|
|
unsigned char *pred_ptr = bd->predictor;
|
|
|
|
int src_stride = be->src_stride;
|
|
|
|
|
|
|
|
int r, c;
|
|
|
|
|
|
|
|
for (r = 0; r < 4; r++)
|
|
|
|
{
|
|
|
|
for (c = 0; c < 4; c++)
|
|
|
|
{
|
|
|
|
diff_ptr[c] = src_ptr[c] - pred_ptr[c];
|
|
|
|
}
|
|
|
|
|
|
|
|
diff_ptr += pitch;
|
|
|
|
pred_ptr += pitch;
|
|
|
|
src_ptr += src_stride;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-11-15 18:53:01 +01:00
|
|
|
void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc,
|
|
|
|
int src_stride, unsigned char *upred,
|
|
|
|
unsigned char *vpred, int pred_stride)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
short *udiff = diff + 256;
|
|
|
|
short *vdiff = diff + 320;
|
|
|
|
|
|
|
|
int r, c;
|
|
|
|
|
|
|
|
for (r = 0; r < 8; r++)
|
|
|
|
{
|
|
|
|
for (c = 0; c < 8; c++)
|
|
|
|
{
|
|
|
|
udiff[c] = usrc[c] - upred[c];
|
|
|
|
}
|
|
|
|
|
|
|
|
udiff += 8;
|
2011-11-15 18:53:01 +01:00
|
|
|
upred += pred_stride;
|
|
|
|
usrc += src_stride;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for (r = 0; r < 8; r++)
|
|
|
|
{
|
|
|
|
for (c = 0; c < 8; c++)
|
|
|
|
{
|
|
|
|
vdiff[c] = vsrc[c] - vpred[c];
|
|
|
|
}
|
|
|
|
|
|
|
|
vdiff += 8;
|
2011-11-15 18:53:01 +01:00
|
|
|
vpred += pred_stride;
|
|
|
|
vsrc += src_stride;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-11-15 18:53:01 +01:00
|
|
|
void vp8_subtract_mby_c(short *diff, unsigned char *src, int src_stride,
|
|
|
|
unsigned char *pred, int pred_stride)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
int r, c;
|
|
|
|
|
|
|
|
for (r = 0; r < 16; r++)
|
|
|
|
{
|
|
|
|
for (c = 0; c < 16; c++)
|
|
|
|
{
|
|
|
|
diff[c] = src[c] - pred[c];
|
|
|
|
}
|
|
|
|
|
|
|
|
diff += 16;
|
2011-11-15 18:53:01 +01:00
|
|
|
pred += pred_stride;
|
|
|
|
src += src_stride;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-13 01:55:44 +01:00
|
|
|
static void vp8_subtract_mb(MACROBLOCK *x)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-06-23 19:54:02 +02:00
|
|
|
BLOCK *b = &x->block[0];
|
|
|
|
|
2012-01-13 01:55:44 +01:00
|
|
|
vp8_subtract_mby(x->src_diff, *(b->base_src),
|
2011-12-15 20:23:36 +01:00
|
|
|
b->src_stride, x->e_mbd.dst.y_buffer, x->e_mbd.dst.y_stride);
|
2012-01-13 01:55:44 +01:00
|
|
|
vp8_subtract_mbuv(x->src_diff, x->src.u_buffer,
|
2011-12-15 20:23:36 +01:00
|
|
|
x->src.v_buffer, x->src.uv_stride, x->e_mbd.dst.u_buffer,
|
|
|
|
x->e_mbd.dst.v_buffer, x->e_mbd.dst.uv_stride);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2011-03-17 22:07:59 +01:00
|
|
|
static void build_dcblock(MACROBLOCK *x)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
short *src_diff_ptr = &x->src_diff[384];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 16; i++)
|
|
|
|
{
|
|
|
|
src_diff_ptr[i] = x->coeff[i * 16];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void vp8_transform_mbuv(MACROBLOCK *x)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 16; i < 24; i += 2)
|
|
|
|
{
|
2012-01-13 01:55:44 +01:00
|
|
|
x->short_fdct8x4(&x->block[i].src_diff[0],
|
2010-06-16 21:52:18 +02:00
|
|
|
&x->block[i].coeff[0], 16);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-08-11 06:45:34 +02:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
void vp8_transform_intra_mby(MACROBLOCK *x)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 16; i += 2)
|
|
|
|
{
|
2012-01-13 01:55:44 +01:00
|
|
|
x->short_fdct8x4(&x->block[i].src_diff[0],
|
2010-06-16 21:52:18 +02:00
|
|
|
&x->block[i].coeff[0], 32);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2012-05-21 23:30:56 +02:00
|
|
|
/* build dc block from 16 y dc values */
|
2011-03-17 22:07:59 +01:00
|
|
|
build_dcblock(x);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-05-21 23:30:56 +02:00
|
|
|
/* do 2nd order transform on the dc block */
|
2010-06-16 21:52:18 +02:00
|
|
|
x->short_walsh4x4(&x->block[24].src_diff[0],
|
|
|
|
&x->block[24].coeff[0], 8);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-03-17 22:07:59 +01:00
|
|
|
static void transform_mb(MACROBLOCK *x)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 16; i += 2)
|
|
|
|
{
|
2012-01-13 01:55:44 +01:00
|
|
|
x->short_fdct8x4(&x->block[i].src_diff[0],
|
2010-06-16 21:52:18 +02:00
|
|
|
&x->block[i].coeff[0], 32);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2012-05-21 23:30:56 +02:00
|
|
|
/* build dc block from 16 y dc values */
|
2010-08-12 22:25:43 +02:00
|
|
|
if (x->e_mbd.mode_info_context->mbmi.mode != SPLITMV)
|
2011-03-17 22:07:59 +01:00
|
|
|
build_dcblock(x);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
for (i = 16; i < 24; i += 2)
|
|
|
|
{
|
2012-01-13 01:55:44 +01:00
|
|
|
x->short_fdct8x4(&x->block[i].src_diff[0],
|
2010-06-16 21:52:18 +02:00
|
|
|
&x->block[i].coeff[0], 16);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2012-05-21 23:30:56 +02:00
|
|
|
/* do 2nd order transform on the dc block */
|
2010-08-12 22:25:43 +02:00
|
|
|
if (x->e_mbd.mode_info_context->mbmi.mode != SPLITMV)
|
2010-06-16 21:52:18 +02:00
|
|
|
x->short_walsh4x4(&x->block[24].src_diff[0],
|
|
|
|
&x->block[24].coeff[0], 8);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2011-03-17 22:07:59 +01:00
|
|
|
|
|
|
|
static void transform_mby(MACROBLOCK *x)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 16; i += 2)
|
|
|
|
{
|
2012-01-13 01:55:44 +01:00
|
|
|
x->short_fdct8x4(&x->block[i].src_diff[0],
|
2010-06-16 21:52:18 +02:00
|
|
|
&x->block[i].coeff[0], 32);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2012-05-21 23:30:56 +02:00
|
|
|
/* build dc block from 16 y dc values */
|
2010-08-12 22:25:43 +02:00
|
|
|
if (x->e_mbd.mode_info_context->mbmi.mode != SPLITMV)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-03-17 22:07:59 +01:00
|
|
|
build_dcblock(x);
|
2010-06-16 21:52:18 +02:00
|
|
|
x->short_walsh4x4(&x->block[24].src_diff[0],
|
|
|
|
&x->block[24].coeff[0], 8);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
#define RDTRUNC(RM,DM,R,D) ( (128+(R)*(RM)) & 0xFF )
|
|
|
|
|
|
|
|
typedef struct vp8_token_state vp8_token_state;
|
|
|
|
|
|
|
|
struct vp8_token_state{
|
|
|
|
int rate;
|
|
|
|
int error;
|
|
|
|
signed char next;
|
|
|
|
signed char token;
|
|
|
|
short qc;
|
|
|
|
};
|
|
|
|
|
2012-05-21 23:30:56 +02:00
|
|
|
/* TODO: experiments to find optimal multiple numbers */
|
2010-12-06 22:33:01 +01:00
|
|
|
#define Y1_RD_MULT 4
|
|
|
|
#define UV_RD_MULT 2
|
|
|
|
#define Y2_RD_MULT 16
|
2010-10-01 05:41:37 +02:00
|
|
|
|
|
|
|
static const int plane_rd_mult[4]=
|
|
|
|
{
|
|
|
|
Y1_RD_MULT,
|
|
|
|
Y2_RD_MULT,
|
|
|
|
UV_RD_MULT,
|
|
|
|
Y1_RD_MULT
|
|
|
|
};
|
|
|
|
|
2011-03-17 22:07:59 +01:00
|
|
|
static void optimize_b(MACROBLOCK *mb, int ib, int type,
|
2012-01-13 01:55:44 +01:00
|
|
|
ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
BLOCK *b;
|
|
|
|
BLOCKD *d;
|
|
|
|
vp8_token_state tokens[17][2];
|
|
|
|
unsigned best_mask[2];
|
|
|
|
const short *dequant_ptr;
|
|
|
|
const short *coeff_ptr;
|
|
|
|
short *qcoeff_ptr;
|
|
|
|
short *dqcoeff_ptr;
|
|
|
|
int eob;
|
|
|
|
int i0;
|
|
|
|
int rc;
|
|
|
|
int x;
|
2011-05-09 17:16:31 +02:00
|
|
|
int sz = 0;
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
int next;
|
|
|
|
int rdmult;
|
|
|
|
int rddiv;
|
|
|
|
int final_eob;
|
|
|
|
int rd_cost0;
|
|
|
|
int rd_cost1;
|
|
|
|
int rate0;
|
|
|
|
int rate1;
|
|
|
|
int error0;
|
|
|
|
int error1;
|
|
|
|
int t0;
|
|
|
|
int t1;
|
|
|
|
int best;
|
|
|
|
int band;
|
|
|
|
int pt;
|
2010-10-01 05:41:37 +02:00
|
|
|
int i;
|
|
|
|
int err_mult = plane_rd_mult[type];
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
|
2010-10-01 05:41:37 +02:00
|
|
|
b = &mb->block[ib];
|
|
|
|
d = &mb->e_mbd.block[ib];
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
|
|
|
|
/* Enable this to test the effect of RDO as a replacement for the dynamic
|
|
|
|
* zero bin instead of an augmentation of it.
|
|
|
|
*/
|
|
|
|
#if 0
|
|
|
|
vp8_strict_quantize_b(b, d);
|
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-10-22 02:04:30 +02:00
|
|
|
dequant_ptr = d->dequant;
|
|
|
|
coeff_ptr = b->coeff;
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
qcoeff_ptr = d->qcoeff;
|
|
|
|
dqcoeff_ptr = d->dqcoeff;
|
|
|
|
i0 = !type;
|
2011-10-25 13:25:11 +02:00
|
|
|
eob = *d->eob;
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
|
|
|
|
/* Now set up a Viterbi trellis to evaluate alternative roundings. */
|
2010-12-06 22:33:01 +01:00
|
|
|
rdmult = mb->rdmult * err_mult;
|
2010-11-11 06:16:17 +01:00
|
|
|
if(mb->e_mbd.mode_info_context->mbmi.ref_frame==INTRA_FRAME)
|
|
|
|
rdmult = (rdmult * 9)>>4;
|
|
|
|
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
rddiv = mb->rddiv;
|
|
|
|
best_mask[0] = best_mask[1] = 0;
|
|
|
|
/* Initialize the sentinel node of the trellis. */
|
|
|
|
tokens[eob][0].rate = 0;
|
|
|
|
tokens[eob][0].error = 0;
|
|
|
|
tokens[eob][0].next = 16;
|
|
|
|
tokens[eob][0].token = DCT_EOB_TOKEN;
|
|
|
|
tokens[eob][0].qc = 0;
|
|
|
|
*(tokens[eob] + 1) = *(tokens[eob] + 0);
|
|
|
|
next = eob;
|
|
|
|
for (i = eob; i-- > i0;)
|
|
|
|
{
|
|
|
|
int base_bits;
|
|
|
|
int d2;
|
|
|
|
int dx;
|
|
|
|
|
|
|
|
rc = vp8_default_zig_zag1d[i];
|
|
|
|
x = qcoeff_ptr[rc];
|
|
|
|
/* Only add a trellis state for non-zero coefficients. */
|
|
|
|
if (x)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
int shortcut=0;
|
|
|
|
error0 = tokens[next][0].error;
|
|
|
|
error1 = tokens[next][1].error;
|
|
|
|
/* Evaluate the first possibility for this state. */
|
|
|
|
rate0 = tokens[next][0].rate;
|
|
|
|
rate1 = tokens[next][1].rate;
|
|
|
|
t0 = (vp8_dct_value_tokens_ptr + x)->Token;
|
|
|
|
/* Consider both possible successor states. */
|
|
|
|
if (next < 16)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
band = vp8_coef_bands[i + 1];
|
|
|
|
pt = vp8_prev_token_class[t0];
|
|
|
|
rate0 +=
|
|
|
|
mb->token_costs[type][band][pt][tokens[next][0].token];
|
|
|
|
rate1 +=
|
|
|
|
mb->token_costs[type][band][pt][tokens[next][1].token];
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
rd_cost0 = RDCOST(rdmult, rddiv, rate0, error0);
|
|
|
|
rd_cost1 = RDCOST(rdmult, rddiv, rate1, error1);
|
|
|
|
if (rd_cost0 == rd_cost1)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
rd_cost0 = RDTRUNC(rdmult, rddiv, rate0, error0);
|
|
|
|
rd_cost1 = RDTRUNC(rdmult, rddiv, rate1, error1);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
/* And pick the best. */
|
|
|
|
best = rd_cost1 < rd_cost0;
|
|
|
|
base_bits = *(vp8_dct_value_cost_ptr + x);
|
|
|
|
dx = dqcoeff_ptr[rc] - coeff_ptr[rc];
|
|
|
|
d2 = dx*dx;
|
|
|
|
tokens[i][0].rate = base_bits + (best ? rate1 : rate0);
|
|
|
|
tokens[i][0].error = d2 + (best ? error1 : error0);
|
|
|
|
tokens[i][0].next = next;
|
|
|
|
tokens[i][0].token = t0;
|
|
|
|
tokens[i][0].qc = x;
|
|
|
|
best_mask[0] |= best << i;
|
|
|
|
/* Evaluate the second possibility for this state. */
|
|
|
|
rate0 = tokens[next][0].rate;
|
|
|
|
rate1 = tokens[next][1].rate;
|
|
|
|
|
|
|
|
if((abs(x)*dequant_ptr[rc]>abs(coeff_ptr[rc])) &&
|
|
|
|
(abs(x)*dequant_ptr[rc]<abs(coeff_ptr[rc])+dequant_ptr[rc]))
|
|
|
|
shortcut = 1;
|
|
|
|
else
|
|
|
|
shortcut = 0;
|
|
|
|
|
|
|
|
if(shortcut)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
sz = -(x < 0);
|
|
|
|
x -= 2*sz + 1;
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
/* Consider both possible successor states. */
|
|
|
|
if (!x)
|
|
|
|
{
|
|
|
|
/* If we reduced this coefficient to zero, check to see if
|
|
|
|
* we need to move the EOB back here.
|
|
|
|
*/
|
|
|
|
t0 = tokens[next][0].token == DCT_EOB_TOKEN ?
|
|
|
|
DCT_EOB_TOKEN : ZERO_TOKEN;
|
|
|
|
t1 = tokens[next][1].token == DCT_EOB_TOKEN ?
|
|
|
|
DCT_EOB_TOKEN : ZERO_TOKEN;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
t0=t1 = (vp8_dct_value_tokens_ptr + x)->Token;
|
|
|
|
}
|
|
|
|
if (next < 16)
|
|
|
|
{
|
|
|
|
band = vp8_coef_bands[i + 1];
|
|
|
|
if(t0!=DCT_EOB_TOKEN)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
pt = vp8_prev_token_class[t0];
|
|
|
|
rate0 += mb->token_costs[type][band][pt][
|
|
|
|
tokens[next][0].token];
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
if(t1!=DCT_EOB_TOKEN)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
pt = vp8_prev_token_class[t1];
|
|
|
|
rate1 += mb->token_costs[type][band][pt][
|
|
|
|
tokens[next][1].token];
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
rd_cost0 = RDCOST(rdmult, rddiv, rate0, error0);
|
|
|
|
rd_cost1 = RDCOST(rdmult, rddiv, rate1, error1);
|
|
|
|
if (rd_cost0 == rd_cost1)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
rd_cost0 = RDTRUNC(rdmult, rddiv, rate0, error0);
|
|
|
|
rd_cost1 = RDTRUNC(rdmult, rddiv, rate1, error1);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
/* And pick the best. */
|
|
|
|
best = rd_cost1 < rd_cost0;
|
|
|
|
base_bits = *(vp8_dct_value_cost_ptr + x);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
if(shortcut)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
dx -= (dequant_ptr[rc] + sz) ^ sz;
|
|
|
|
d2 = dx*dx;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
tokens[i][1].rate = base_bits + (best ? rate1 : rate0);
|
|
|
|
tokens[i][1].error = d2 + (best ? error1 : error0);
|
|
|
|
tokens[i][1].next = next;
|
|
|
|
tokens[i][1].token =best?t1:t0;
|
|
|
|
tokens[i][1].qc = x;
|
|
|
|
best_mask[1] |= best << i;
|
|
|
|
/* Finally, make this the new head of the trellis. */
|
|
|
|
next = i;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
/* There's no choice to make for a zero coefficient, so we don't
|
|
|
|
* add a new trellis node, but we do need to update the costs.
|
|
|
|
*/
|
2010-05-18 17:58:33 +02:00
|
|
|
else
|
|
|
|
{
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
band = vp8_coef_bands[i + 1];
|
|
|
|
t0 = tokens[next][0].token;
|
|
|
|
t1 = tokens[next][1].token;
|
|
|
|
/* Update the cost of each path if we're past the EOB token. */
|
|
|
|
if (t0 != DCT_EOB_TOKEN)
|
|
|
|
{
|
|
|
|
tokens[next][0].rate += mb->token_costs[type][band][0][t0];
|
|
|
|
tokens[next][0].token = ZERO_TOKEN;
|
|
|
|
}
|
|
|
|
if (t1 != DCT_EOB_TOKEN)
|
|
|
|
{
|
|
|
|
tokens[next][1].rate += mb->token_costs[type][band][0][t1];
|
|
|
|
tokens[next][1].token = ZERO_TOKEN;
|
|
|
|
}
|
|
|
|
/* Don't update next, because we didn't add a new node. */
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
/* Now pick the best path through the whole trellis. */
|
|
|
|
band = vp8_coef_bands[i + 1];
|
|
|
|
VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
|
|
|
|
rate0 = tokens[next][0].rate;
|
|
|
|
rate1 = tokens[next][1].rate;
|
|
|
|
error0 = tokens[next][0].error;
|
|
|
|
error1 = tokens[next][1].error;
|
|
|
|
t0 = tokens[next][0].token;
|
|
|
|
t1 = tokens[next][1].token;
|
|
|
|
rate0 += mb->token_costs[type][band][pt][t0];
|
|
|
|
rate1 += mb->token_costs[type][band][pt][t1];
|
|
|
|
rd_cost0 = RDCOST(rdmult, rddiv, rate0, error0);
|
|
|
|
rd_cost1 = RDCOST(rdmult, rddiv, rate1, error1);
|
|
|
|
if (rd_cost0 == rd_cost1)
|
|
|
|
{
|
|
|
|
rd_cost0 = RDTRUNC(rdmult, rddiv, rate0, error0);
|
|
|
|
rd_cost1 = RDTRUNC(rdmult, rddiv, rate1, error1);
|
|
|
|
}
|
|
|
|
best = rd_cost1 < rd_cost0;
|
|
|
|
final_eob = i0 - 1;
|
|
|
|
for (i = next; i < eob; i = next)
|
|
|
|
{
|
|
|
|
x = tokens[i][best].qc;
|
|
|
|
if (x)
|
|
|
|
final_eob = i;
|
|
|
|
rc = vp8_default_zig_zag1d[i];
|
|
|
|
qcoeff_ptr[rc] = x;
|
|
|
|
dqcoeff_ptr[rc] = x * dequant_ptr[rc];
|
|
|
|
next = tokens[i][best].next;
|
|
|
|
best = (best_mask[best] >> i) & 1;
|
|
|
|
}
|
|
|
|
final_eob++;
|
|
|
|
|
2011-10-25 13:25:11 +02:00
|
|
|
*a = *l = (final_eob != !type);
|
|
|
|
*d->eob = (char)final_eob;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2011-10-20 21:32:34 +02:00
|
|
|
static void check_reset_2nd_coeffs(MACROBLOCKD *x, int type,
|
|
|
|
ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l)
|
|
|
|
{
|
|
|
|
int sum=0;
|
|
|
|
int i;
|
|
|
|
BLOCKD *bd = &x->block[24];
|
|
|
|
|
|
|
|
if(bd->dequant[0]>=35 && bd->dequant[1]>=35)
|
|
|
|
return;
|
|
|
|
|
2011-11-04 08:36:49 +01:00
|
|
|
for(i=0;i<(*bd->eob);i++)
|
2011-10-20 21:32:34 +02:00
|
|
|
{
|
|
|
|
int coef = bd->dqcoeff[vp8_default_zig_zag1d[i]];
|
|
|
|
sum+= (coef>=0)?coef:-coef;
|
|
|
|
if(sum>=35)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/**************************************************************************
|
|
|
|
our inverse hadamard transform effectively is weighted sum of all 16 inputs
|
|
|
|
with weight either 1 or -1. It has a last stage scaling of (sum+3)>>3. And
|
|
|
|
dc only idct is (dc+4)>>3. So if all the sums are between -35 and 29, the
|
|
|
|
output after inverse wht and idct will be all zero. A sum of absolute value
|
|
|
|
smaller than 35 guarantees all 16 different (+1/-1) weighted sums in wht
|
|
|
|
fall between -35 and +35.
|
|
|
|
**************************************************************************/
|
|
|
|
if(sum < 35)
|
|
|
|
{
|
2011-11-04 08:36:49 +01:00
|
|
|
for(i=0;i<(*bd->eob);i++)
|
2011-10-20 21:32:34 +02:00
|
|
|
{
|
|
|
|
int rc = vp8_default_zig_zag1d[i];
|
|
|
|
bd->qcoeff[rc]=0;
|
|
|
|
bd->dqcoeff[rc]=0;
|
|
|
|
}
|
2011-11-04 08:36:49 +01:00
|
|
|
*bd->eob = 0;
|
|
|
|
*a = *l = (*bd->eob != !type);
|
2011-10-20 21:32:34 +02:00
|
|
|
}
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-01-13 01:55:44 +01:00
|
|
|
static void optimize_mb(MACROBLOCK *x)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
int b;
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
int type;
|
|
|
|
int has_2nd_order;
|
2011-10-20 21:32:34 +02:00
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
ENTROPY_CONTEXT_PLANES t_above, t_left;
|
|
|
|
ENTROPY_CONTEXT *ta;
|
|
|
|
ENTROPY_CONTEXT *tl;
|
|
|
|
|
|
|
|
vpx_memcpy(&t_above, x->e_mbd.above_context, sizeof(ENTROPY_CONTEXT_PLANES));
|
|
|
|
vpx_memcpy(&t_left, x->e_mbd.left_context, sizeof(ENTROPY_CONTEXT_PLANES));
|
|
|
|
|
|
|
|
ta = (ENTROPY_CONTEXT *)&t_above;
|
|
|
|
tl = (ENTROPY_CONTEXT *)&t_left;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-08-12 22:25:43 +02:00
|
|
|
has_2nd_order = (x->e_mbd.mode_info_context->mbmi.mode != B_PRED
|
|
|
|
&& x->e_mbd.mode_info_context->mbmi.mode != SPLITMV);
|
2011-02-23 22:37:08 +01:00
|
|
|
type = has_2nd_order ? PLANE_TYPE_Y_NO_DC : PLANE_TYPE_Y_WITH_DC;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
for (b = 0; b < 16; b++)
|
|
|
|
{
|
2011-03-17 22:07:59 +01:00
|
|
|
optimize_b(x, b, type,
|
2012-01-13 01:55:44 +01:00
|
|
|
ta + vp8_block2above[b], tl + vp8_block2left[b]);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2011-02-23 22:37:08 +01:00
|
|
|
for (b = 16; b < 24; b++)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-03-17 22:07:59 +01:00
|
|
|
optimize_b(x, b, PLANE_TYPE_UV,
|
2012-01-13 01:55:44 +01:00
|
|
|
ta + vp8_block2above[b], tl + vp8_block2left[b]);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
if (has_2nd_order)
|
|
|
|
{
|
2010-10-01 05:41:37 +02:00
|
|
|
b=24;
|
2011-03-17 22:07:59 +01:00
|
|
|
optimize_b(x, b, PLANE_TYPE_Y2,
|
2012-01-13 01:55:44 +01:00
|
|
|
ta + vp8_block2above[b], tl + vp8_block2left[b]);
|
2011-10-20 21:32:34 +02:00
|
|
|
check_reset_2nd_coeffs(&x->e_mbd, PLANE_TYPE_Y2,
|
|
|
|
ta + vp8_block2above[b], tl + vp8_block2left[b]);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-01-13 01:55:44 +01:00
|
|
|
void vp8_optimize_mby(MACROBLOCK *x)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
int b;
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
int type;
|
|
|
|
int has_2nd_order;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
ENTROPY_CONTEXT_PLANES t_above, t_left;
|
|
|
|
ENTROPY_CONTEXT *ta;
|
|
|
|
ENTROPY_CONTEXT *tl;
|
|
|
|
|
|
|
|
if (!x->e_mbd.above_context)
|
2010-05-18 17:58:33 +02:00
|
|
|
return;
|
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
if (!x->e_mbd.left_context)
|
2010-05-18 17:58:33 +02:00
|
|
|
return;
|
2010-08-31 16:49:57 +02:00
|
|
|
|
|
|
|
vpx_memcpy(&t_above, x->e_mbd.above_context, sizeof(ENTROPY_CONTEXT_PLANES));
|
|
|
|
vpx_memcpy(&t_left, x->e_mbd.left_context, sizeof(ENTROPY_CONTEXT_PLANES));
|
|
|
|
|
|
|
|
ta = (ENTROPY_CONTEXT *)&t_above;
|
|
|
|
tl = (ENTROPY_CONTEXT *)&t_left;
|
|
|
|
|
2010-08-12 22:25:43 +02:00
|
|
|
has_2nd_order = (x->e_mbd.mode_info_context->mbmi.mode != B_PRED
|
|
|
|
&& x->e_mbd.mode_info_context->mbmi.mode != SPLITMV);
|
2011-02-23 22:37:08 +01:00
|
|
|
type = has_2nd_order ? PLANE_TYPE_Y_NO_DC : PLANE_TYPE_Y_WITH_DC;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
for (b = 0; b < 16; b++)
|
|
|
|
{
|
2011-03-17 22:07:59 +01:00
|
|
|
optimize_b(x, b, type,
|
2012-01-13 01:55:44 +01:00
|
|
|
ta + vp8_block2above[b], tl + vp8_block2left[b]);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2010-10-01 05:41:37 +02:00
|
|
|
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
if (has_2nd_order)
|
|
|
|
{
|
2010-10-01 05:41:37 +02:00
|
|
|
b=24;
|
2011-03-17 22:07:59 +01:00
|
|
|
optimize_b(x, b, PLANE_TYPE_Y2,
|
2012-01-13 01:55:44 +01:00
|
|
|
ta + vp8_block2above[b], tl + vp8_block2left[b]);
|
2011-10-20 21:32:34 +02:00
|
|
|
check_reset_2nd_coeffs(&x->e_mbd, PLANE_TYPE_Y2,
|
|
|
|
ta + vp8_block2above[b], tl + vp8_block2left[b]);
|
Add trellis quantization.
Replace the exponential search for optimal rounding during
quantization with a linear Viterbi trellis and enable it
by default when using --best.
Right now this operates on top of the output of the adaptive
zero-bin quantizer in vp8_regular_quantize_b() and gives a small
gain.
It can be tested as a replacement for that quantizer by
enabling the call to vp8_strict_quantize_b(), which uses
normal rounding and no zero bin offset.
Ultimately, the quantizer will have to become a function of lambda
in order to take advantage of activity masking, since there is
limited ability to change the quantization factor itself.
However, currently vp8_strict_quantize_b() plus the trellis
quantizer (which is lambda-dependent) loses to
vp8_regular_quantize_b() alone (which is not) on my test clip.
Patch Set 3:
Fix an issue related to the cost evaluation of successor
states when a coefficient is reduced to zero. With this
issue fixed, now the trellis search almost exactly matches
the exponential search.
Patch Set 2:
Overall, the goal of this patch set is to make "trellis"
search to produce encodings that match the exponential
search version. There are three main differences between
Patch Set 2 and 1:
a. Patch set 1 did not properly account for the scale of
2nd order error, so patch set 2 disable it all together
for 2nd blocks.
b. Patch set 1 was not consistent on when to enable the
the quantization optimization. Patch set 2 restore the
condition to be consistent.
c. Patch set 1 checks quantized level L-1, and L for any
input coefficient was quantized to L. Patch set 2 limits
the candidate coefficient to those that were rounded up
to L. It is worth noting here that a strategy to check
L and L+1 for coefficients that were truncated down to L
might work.
(a and b get trellis quant to basically match the exponential
search on all mid/low rate encodings on cif set, without
a, b, trellis quant can hurt the psnr by 0.2 to .3db at
200kbps for some cif clips)
(c gets trellis quant to match the exponential search
to match at Q0 encoding, without c, trellis quant can be
1.5 to 2db lower for encodings with fixed Q at 0 on most
derf cif clips)
Change-Id: Ib1a043b665d75fbf00cb0257b7c18e90eebab95e
2010-07-02 23:35:53 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2012-01-13 01:55:44 +01:00
|
|
|
void vp8_optimize_mbuv(MACROBLOCK *x)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
int b;
|
2010-08-31 16:49:57 +02:00
|
|
|
ENTROPY_CONTEXT_PLANES t_above, t_left;
|
|
|
|
ENTROPY_CONTEXT *ta;
|
|
|
|
ENTROPY_CONTEXT *tl;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
if (!x->e_mbd.above_context)
|
2010-05-18 17:58:33 +02:00
|
|
|
return;
|
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
if (!x->e_mbd.left_context)
|
2010-05-18 17:58:33 +02:00
|
|
|
return;
|
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
vpx_memcpy(&t_above, x->e_mbd.above_context, sizeof(ENTROPY_CONTEXT_PLANES));
|
|
|
|
vpx_memcpy(&t_left, x->e_mbd.left_context, sizeof(ENTROPY_CONTEXT_PLANES));
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2010-08-31 16:49:57 +02:00
|
|
|
ta = (ENTROPY_CONTEXT *)&t_above;
|
|
|
|
tl = (ENTROPY_CONTEXT *)&t_left;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-02-23 22:37:08 +01:00
|
|
|
for (b = 16; b < 24; b++)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-03-17 22:07:59 +01:00
|
|
|
optimize_b(x, b, PLANE_TYPE_UV,
|
2012-01-13 01:55:44 +01:00
|
|
|
ta + vp8_block2above[b], tl + vp8_block2left[b]);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-13 01:55:44 +01:00
|
|
|
void vp8_encode_inter16x16(MACROBLOCK *x)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-12-15 20:23:36 +01:00
|
|
|
vp8_build_inter_predictors_mb(&x->e_mbd);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-01-13 01:55:44 +01:00
|
|
|
vp8_subtract_mb(x);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-03-17 22:07:59 +01:00
|
|
|
transform_mb(x);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
vp8_quantize_mb(x);
|
|
|
|
|
2010-10-11 23:37:27 +02:00
|
|
|
if (x->optimize)
|
2012-01-13 01:55:44 +01:00
|
|
|
optimize_mb(x);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* this funciton is used by first pass only */
|
2012-01-13 01:55:44 +01:00
|
|
|
void vp8_encode_inter16x16y(MACROBLOCK *x)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2011-06-23 19:54:02 +02:00
|
|
|
BLOCK *b = &x->block[0];
|
|
|
|
|
2011-12-15 20:23:36 +01:00
|
|
|
vp8_build_inter16x16_predictors_mby(&x->e_mbd, x->e_mbd.dst.y_buffer,
|
|
|
|
x->e_mbd.dst.y_stride);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-01-13 01:55:44 +01:00
|
|
|
vp8_subtract_mby(x->src_diff, *(b->base_src),
|
2011-12-15 20:23:36 +01:00
|
|
|
b->src_stride, x->e_mbd.dst.y_buffer, x->e_mbd.dst.y_stride);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-03-17 22:07:59 +01:00
|
|
|
transform_mby(x);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
vp8_quantize_mby(x);
|
|
|
|
|
2012-01-13 01:55:44 +01:00
|
|
|
vp8_inverse_transform_mby(&x->e_mbd);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|