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
|
|
|
*/
|
|
|
|
|
2013-10-02 23:13:33 +02:00
|
|
|
|
|
|
|
#include "./vp9_rtcd.h"
|
2012-12-23 16:20:10 +01:00
|
|
|
#include "./vpx_config.h"
|
2013-10-02 23:13:33 +02:00
|
|
|
|
|
|
|
#include "vpx_mem/vpx_mem.h"
|
|
|
|
|
|
|
|
#include "vp9/common/vp9_idct.h"
|
2012-11-27 22:59:17 +01:00
|
|
|
#include "vp9/common/vp9_reconinter.h"
|
|
|
|
#include "vp9/common/vp9_reconintra.h"
|
|
|
|
#include "vp9/common/vp9_systemdependent.h"
|
2013-10-02 23:13:33 +02:00
|
|
|
|
|
|
|
#include "vp9/encoder/vp9_encodemb.h"
|
|
|
|
#include "vp9/encoder/vp9_quantize.h"
|
|
|
|
#include "vp9/encoder/vp9_rdopt.h"
|
|
|
|
#include "vp9/encoder/vp9_tokenize.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2014-02-09 04:30:45 +01:00
|
|
|
struct optimize_ctx {
|
|
|
|
ENTROPY_CONTEXT ta[MAX_MB_PLANE][16];
|
|
|
|
ENTROPY_CONTEXT tl[MAX_MB_PLANE][16];
|
|
|
|
};
|
|
|
|
|
|
|
|
struct encode_b_args {
|
|
|
|
MACROBLOCK *x;
|
|
|
|
struct optimize_ctx *ctx;
|
2014-02-13 02:44:12 +01:00
|
|
|
unsigned char *skip;
|
2014-02-09 04:30:45 +01:00
|
|
|
};
|
|
|
|
|
2013-06-21 18:35:37 +02:00
|
|
|
void vp9_subtract_block_c(int rows, int cols,
|
2014-02-14 02:40:10 +01:00
|
|
|
int16_t *diff, ptrdiff_t diff_stride,
|
|
|
|
const uint8_t *src, ptrdiff_t src_stride,
|
|
|
|
const uint8_t *pred, ptrdiff_t pred_stride) {
|
2012-07-14 00:21:29 +02:00
|
|
|
int r, c;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-23 17:26:10 +02:00
|
|
|
for (r = 0; r < rows; r++) {
|
|
|
|
for (c = 0; c < cols; c++)
|
2014-02-14 02:40:10 +01:00
|
|
|
diff[c] = src[c] - pred[c];
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2014-02-14 02:40:10 +01:00
|
|
|
diff += diff_stride;
|
|
|
|
pred += pred_stride;
|
|
|
|
src += src_stride;
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2014-02-17 13:57:40 +01:00
|
|
|
void vp9_subtract_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane) {
|
2013-05-31 21:30:32 +02:00
|
|
|
struct macroblock_plane *const p = &x->plane[plane];
|
2013-11-20 21:39:29 +01:00
|
|
|
const struct macroblockd_plane *const pd = &x->e_mbd.plane[plane];
|
|
|
|
const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
|
|
|
|
const int bw = 4 * num_4x4_blocks_wide_lookup[plane_bsize];
|
|
|
|
const int bh = 4 * num_4x4_blocks_high_lookup[plane_bsize];
|
2013-05-31 21:30:32 +02:00
|
|
|
|
2013-11-20 21:39:29 +01:00
|
|
|
vp9_subtract_block(bh, bw, p->src_diff, bw, p->src.buf, p->src.stride,
|
2013-05-31 21:30:32 +02:00
|
|
|
pd->dst.buf, pd->dst.stride);
|
2011-08-05 01:30:27 +02:00
|
|
|
}
|
|
|
|
|
2013-10-06 02:24:51 +02:00
|
|
|
#define RDTRUNC(RM, DM, R, D) ((128 + (R) * (RM)) & 0xFF)
|
2012-10-31 22:40:53 +01:00
|
|
|
typedef struct vp9_token_state vp9_token_state;
|
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
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
struct vp9_token_state {
|
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 rate;
|
|
|
|
int error;
|
2012-08-03 02:03:14 +02:00
|
|
|
int next;
|
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
|
|
|
signed char token;
|
|
|
|
short qc;
|
|
|
|
};
|
|
|
|
|
2013-10-06 02:24:51 +02:00
|
|
|
// TODO(jimbankoski): experiment to find optimal RD numbers.
|
2010-12-06 22:33:01 +01:00
|
|
|
#define Y1_RD_MULT 4
|
|
|
|
#define UV_RD_MULT 2
|
2010-10-01 05:41:37 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
static const int plane_rd_mult[4] = {
|
|
|
|
Y1_RD_MULT,
|
|
|
|
UV_RD_MULT,
|
2010-10-01 05:41:37 +02:00
|
|
|
};
|
|
|
|
|
2012-08-11 00:34:31 +02:00
|
|
|
#define UPDATE_RD_COST()\
|
|
|
|
{\
|
|
|
|
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);\
|
|
|
|
}\
|
|
|
|
}
|
|
|
|
|
2013-02-11 20:19:21 +01:00
|
|
|
// This function is a place holder for now but may ultimately need
|
|
|
|
// to scan previous tokens to work out the correct context.
|
2013-07-01 20:36:07 +02:00
|
|
|
static int trellis_get_coeff_context(const int16_t *scan,
|
|
|
|
const int16_t *nb,
|
2013-03-27 00:46:09 +01:00
|
|
|
int idx, int token,
|
2013-07-01 19:40:00 +02:00
|
|
|
uint8_t *token_cache) {
|
2013-03-28 18:42:23 +01:00
|
|
|
int bak = token_cache[scan[idx]], pt;
|
2013-05-23 12:08:00 +02:00
|
|
|
token_cache[scan[idx]] = vp9_pt_energy_class[token];
|
2013-07-01 19:40:00 +02:00
|
|
|
pt = get_coef_context(nb, token_cache, idx + 1);
|
2013-03-28 18:42:23 +01:00
|
|
|
token_cache[scan[idx]] = bak;
|
2013-03-27 00:46:09 +01:00
|
|
|
return pt;
|
2013-02-11 20:19:21 +01:00
|
|
|
}
|
|
|
|
|
2014-02-26 02:23:01 +01:00
|
|
|
static void optimize_b(int plane, int block, BLOCK_SIZE plane_bsize,
|
|
|
|
TX_SIZE tx_size, MACROBLOCK *mb,
|
|
|
|
struct optimize_ctx *ctx) {
|
2013-02-27 19:00:24 +01:00
|
|
|
MACROBLOCKD *const xd = &mb->e_mbd;
|
2013-11-27 03:52:10 +01:00
|
|
|
struct macroblock_plane *p = &mb->plane[plane];
|
2013-08-19 22:20:21 +02:00
|
|
|
struct macroblockd_plane *pd = &xd->plane[plane];
|
2013-10-10 21:11:44 +02:00
|
|
|
const int ref = is_inter_block(&xd->mi_8x8[0]->mbmi);
|
2013-03-04 23:12:17 +01:00
|
|
|
vp9_token_state tokens[1025][2];
|
|
|
|
unsigned best_index[1025][2];
|
2014-02-14 02:40:10 +01:00
|
|
|
const int16_t *coeff = BLOCK_OFFSET(mb->plane[plane].coeff, block);
|
|
|
|
int16_t *qcoeff = BLOCK_OFFSET(p->qcoeff, block);
|
|
|
|
int16_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2013-12-04 02:59:32 +01:00
|
|
|
int eob = p->eobs[block], final_eob, sz = 0;
|
2013-02-15 19:15:42 +01:00
|
|
|
const int i0 = 0;
|
2013-03-04 23:12:17 +01:00
|
|
|
int rc, x, next, i;
|
2012-12-03 23:53:45 +01:00
|
|
|
int64_t rdmult, rddiv, rd_cost0, rd_cost1;
|
|
|
|
int rate0, rate1, error0, error1, t0, t1;
|
|
|
|
int best, band, pt;
|
2013-08-19 22:20:21 +02:00
|
|
|
PLANE_TYPE type = pd->plane_type;
|
2012-07-14 00:21:29 +02:00
|
|
|
int err_mult = plane_rd_mult[type];
|
2013-09-19 14:53:48 +02:00
|
|
|
const int default_eob = 16 << (tx_size << 1);
|
2013-03-04 23:12:17 +01:00
|
|
|
const int mul = 1 + (tx_size == TX_32X32);
|
2013-03-27 00:46:09 +01:00
|
|
|
uint8_t token_cache[1024];
|
2013-08-19 22:20:21 +02:00
|
|
|
const int16_t *dequant_ptr = pd->dequant;
|
2013-11-14 01:02:06 +01:00
|
|
|
const uint8_t *const band_translate = get_band_translate(tx_size);
|
2013-11-23 01:20:45 +01:00
|
|
|
const scan_order *so = get_scan(xd, tx_size, type, block);
|
|
|
|
const int16_t *scan = so->scan;
|
|
|
|
const int16_t *nb = so->neighbors;
|
2014-02-26 02:23:01 +01:00
|
|
|
ENTROPY_CONTEXT *a, *l;
|
|
|
|
int tx_x, tx_y;
|
|
|
|
txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &tx_x, &tx_y);
|
|
|
|
a = &ctx->ta[plane][tx_x];
|
|
|
|
l = &ctx->tl[plane][tx_y];
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-04-30 18:54:51 +02:00
|
|
|
assert((!type && !plane) || (type && plane));
|
2013-04-04 21:03:27 +02:00
|
|
|
assert(eob <= default_eob);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
/* Now set up a Viterbi trellis to evaluate alternative roundings. */
|
|
|
|
rdmult = mb->rdmult * err_mult;
|
2013-11-20 05:25:55 +01:00
|
|
|
if (!is_inter_block(&mb->e_mbd.mi_8x8[0]->mbmi))
|
2012-07-14 00:21:29 +02:00
|
|
|
rdmult = (rdmult * 9) >> 4;
|
|
|
|
rddiv = mb->rddiv;
|
|
|
|
/* Initialize the sentinel node of the trellis. */
|
|
|
|
tokens[eob][0].rate = 0;
|
|
|
|
tokens[eob][0].error = 0;
|
2012-08-11 00:34:31 +02:00
|
|
|
tokens[eob][0].next = default_eob;
|
2013-12-04 02:23:03 +01:00
|
|
|
tokens[eob][0].token = EOB_TOKEN;
|
2012-07-14 00:21:29 +02:00
|
|
|
tokens[eob][0].qc = 0;
|
|
|
|
*(tokens[eob] + 1) = *(tokens[eob] + 0);
|
|
|
|
next = eob;
|
2013-03-27 00:46:09 +01:00
|
|
|
for (i = 0; i < eob; i++)
|
2013-05-23 12:08:00 +02:00
|
|
|
token_cache[scan[i]] = vp9_pt_energy_class[vp9_dct_value_tokens_ptr[
|
2014-02-14 02:40:10 +01:00
|
|
|
qcoeff[scan[i]]].token];
|
2013-03-27 00:46:09 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
for (i = eob; i-- > i0;) {
|
2012-12-03 23:53:45 +01:00
|
|
|
int base_bits, d2, dx;
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2012-08-11 00:34:31 +02:00
|
|
|
rc = scan[i];
|
2014-02-14 02:40:10 +01:00
|
|
|
x = qcoeff[rc];
|
2012-07-14 00:21:29 +02:00
|
|
|
/* Only add a trellis state for non-zero coefficients. */
|
|
|
|
if (x) {
|
|
|
|
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;
|
2013-04-19 01:18:08 +02:00
|
|
|
t0 = (vp9_dct_value_tokens_ptr + x)->token;
|
2012-07-14 00:21:29 +02:00
|
|
|
/* Consider both possible successor states. */
|
2012-08-11 00:34:31 +02:00
|
|
|
if (next < default_eob) {
|
2013-11-06 02:25:38 +01:00
|
|
|
band = band_translate[i + 1];
|
2013-07-01 19:40:00 +02:00
|
|
|
pt = trellis_get_coeff_context(scan, nb, i, t0, token_cache);
|
2012-07-14 00:21:29 +02:00
|
|
|
rate0 +=
|
2013-07-25 00:13:58 +02:00
|
|
|
mb->token_costs[tx_size][type][ref][band][0][pt]
|
2013-06-28 05:57:37 +02:00
|
|
|
[tokens[next][0].token];
|
2012-07-14 00:21:29 +02:00
|
|
|
rate1 +=
|
2013-07-25 00:13:58 +02:00
|
|
|
mb->token_costs[tx_size][type][ref][band][0][pt]
|
2013-06-28 05:57:37 +02:00
|
|
|
[tokens[next][1].token];
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2012-08-11 00:34:31 +02:00
|
|
|
UPDATE_RD_COST();
|
2012-07-14 00:21:29 +02:00
|
|
|
/* And pick the best. */
|
|
|
|
best = rd_cost1 < rd_cost0;
|
2012-10-31 01:12:12 +01:00
|
|
|
base_bits = *(vp9_dct_value_cost_ptr + x);
|
2014-02-14 02:40:10 +01:00
|
|
|
dx = mul * (dqcoeff[rc] - coeff[rc]);
|
2012-07-14 00:21:29 +02:00
|
|
|
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;
|
2012-12-03 23:53:45 +01:00
|
|
|
best_index[i][0] = best;
|
2013-02-20 19:16:24 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
/* Evaluate the second possibility for this state. */
|
|
|
|
rate0 = tokens[next][0].rate;
|
|
|
|
rate1 = tokens[next][1].rate;
|
|
|
|
|
2014-02-14 02:40:10 +01:00
|
|
|
if ((abs(x)*dequant_ptr[rc != 0] > abs(coeff[rc]) * mul) &&
|
|
|
|
(abs(x)*dequant_ptr[rc != 0] < abs(coeff[rc]) * mul +
|
2013-03-04 23:12:17 +01:00
|
|
|
dequant_ptr[rc != 0]))
|
2012-07-14 00:21:29 +02:00
|
|
|
shortcut = 1;
|
|
|
|
else
|
|
|
|
shortcut = 0;
|
|
|
|
|
|
|
|
if (shortcut) {
|
|
|
|
sz = -(x < 0);
|
|
|
|
x -= 2 * sz + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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.
|
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
|
|
|
*/
|
2013-12-04 02:23:03 +01:00
|
|
|
t0 = tokens[next][0].token == EOB_TOKEN ? EOB_TOKEN : ZERO_TOKEN;
|
|
|
|
t1 = tokens[next][1].token == EOB_TOKEN ? EOB_TOKEN : ZERO_TOKEN;
|
2012-07-14 00:21:29 +02:00
|
|
|
} else {
|
2013-04-19 01:18:08 +02:00
|
|
|
t0 = t1 = (vp9_dct_value_tokens_ptr + x)->token;
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2012-08-11 00:34:31 +02:00
|
|
|
if (next < default_eob) {
|
2013-11-06 02:25:38 +01:00
|
|
|
band = band_translate[i + 1];
|
2013-12-04 02:23:03 +01:00
|
|
|
if (t0 != EOB_TOKEN) {
|
2013-07-01 19:40:00 +02:00
|
|
|
pt = trellis_get_coeff_context(scan, nb, i, t0, token_cache);
|
2013-07-25 00:13:58 +02:00
|
|
|
rate0 += mb->token_costs[tx_size][type][ref][band][!x][pt]
|
2013-06-28 05:57:37 +02:00
|
|
|
[tokens[next][0].token];
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2013-12-04 02:23:03 +01:00
|
|
|
if (t1 != EOB_TOKEN) {
|
2013-07-01 19:40:00 +02:00
|
|
|
pt = trellis_get_coeff_context(scan, nb, i, t1, token_cache);
|
2013-07-25 00:13:58 +02:00
|
|
|
rate1 += mb->token_costs[tx_size][type][ref][band][!x][pt]
|
2013-06-28 05:57:37 +02:00
|
|
|
[tokens[next][1].token];
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-08-11 00:34:31 +02:00
|
|
|
UPDATE_RD_COST();
|
2012-07-14 00:21:29 +02:00
|
|
|
/* And pick the best. */
|
|
|
|
best = rd_cost1 < rd_cost0;
|
2012-10-31 01:12:12 +01:00
|
|
|
base_bits = *(vp9_dct_value_cost_ptr + x);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
if (shortcut) {
|
2012-08-11 00:34:31 +02:00
|
|
|
dx -= (dequant_ptr[rc != 0] + sz) ^ sz;
|
2012-07-14 00:21:29 +02:00
|
|
|
d2 = dx * dx;
|
|
|
|
}
|
|
|
|
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;
|
2012-12-03 23:53:45 +01:00
|
|
|
best_index[i][1] = best;
|
2012-07-14 00:21:29 +02:00
|
|
|
/* Finally, make this the new head of the trellis. */
|
|
|
|
next = i;
|
2013-10-06 02:24:51 +02:00
|
|
|
} else {
|
|
|
|
/* 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.
|
|
|
|
*/
|
2013-11-06 02:25:38 +01:00
|
|
|
band = band_translate[i + 1];
|
2012-07-14 00:21:29 +02:00
|
|
|
t0 = tokens[next][0].token;
|
|
|
|
t1 = tokens[next][1].token;
|
|
|
|
/* Update the cost of each path if we're past the EOB token. */
|
2013-12-04 02:23:03 +01:00
|
|
|
if (t0 != EOB_TOKEN) {
|
2013-02-19 22:36:38 +01:00
|
|
|
tokens[next][0].rate +=
|
2013-07-25 00:13:58 +02:00
|
|
|
mb->token_costs[tx_size][type][ref][band][1][0][t0];
|
2012-07-14 00:21:29 +02:00
|
|
|
tokens[next][0].token = ZERO_TOKEN;
|
|
|
|
}
|
2013-12-04 02:23:03 +01:00
|
|
|
if (t1 != EOB_TOKEN) {
|
2013-02-19 22:36:38 +01:00
|
|
|
tokens[next][1].rate +=
|
2013-07-25 00:13:58 +02:00
|
|
|
mb->token_costs[tx_size][type][ref][band][1][0][t1];
|
2012-07-14 00:21:29 +02:00
|
|
|
tokens[next][1].token = ZERO_TOKEN;
|
|
|
|
}
|
2013-07-03 19:09:15 +02:00
|
|
|
best_index[i][0] = best_index[i][1] = 0;
|
2012-07-14 00:21:29 +02:00
|
|
|
/* Don't update next, because we didn't add a new node. */
|
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
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Now pick the best path through the whole trellis. */
|
2013-11-06 02:25:38 +01:00
|
|
|
band = band_translate[i + 1];
|
2013-04-17 00:30:28 +02:00
|
|
|
pt = combine_entropy_contexts(*a, *l);
|
2012-07-14 00:21:29 +02:00
|
|
|
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;
|
2013-07-25 00:13:58 +02:00
|
|
|
rate0 += mb->token_costs[tx_size][type][ref][band][0][pt][t0];
|
|
|
|
rate1 += mb->token_costs[tx_size][type][ref][band][0][pt][t1];
|
2012-08-11 00:34:31 +02:00
|
|
|
UPDATE_RD_COST();
|
2012-07-14 00:21:29 +02:00
|
|
|
best = rd_cost1 < rd_cost0;
|
|
|
|
final_eob = i0 - 1;
|
2014-02-14 02:40:10 +01:00
|
|
|
vpx_memset(qcoeff, 0, sizeof(*qcoeff) * (16 << (tx_size * 2)));
|
|
|
|
vpx_memset(dqcoeff, 0, sizeof(*dqcoeff) * (16 << (tx_size * 2)));
|
2012-07-14 00:21:29 +02:00
|
|
|
for (i = next; i < eob; i = next) {
|
|
|
|
x = tokens[i][best].qc;
|
2013-02-20 19:16:24 +01:00
|
|
|
if (x) {
|
2012-07-14 00:21:29 +02:00
|
|
|
final_eob = i;
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
2012-08-11 00:34:31 +02:00
|
|
|
rc = scan[i];
|
2014-02-14 02:40:10 +01:00
|
|
|
qcoeff[rc] = x;
|
|
|
|
dqcoeff[rc] = (x * dequant_ptr[rc != 0]) / mul;
|
2012-08-11 00:34:31 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
next = tokens[i][best].next;
|
2012-12-03 23:53:45 +01:00
|
|
|
best = best_index[i][best];
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
|
|
|
final_eob++;
|
|
|
|
|
2013-12-04 02:59:32 +01:00
|
|
|
mb->plane[plane].eobs[block] = final_eob;
|
2013-02-27 19:00:24 +01:00
|
|
|
*a = *l = (final_eob > 0);
|
2011-10-25 19:25:02 +02:00
|
|
|
}
|
|
|
|
|
2013-08-27 20:05:08 +02:00
|
|
|
static void optimize_init_b(int plane, BLOCK_SIZE bsize,
|
2013-08-22 01:40:16 +02:00
|
|
|
struct encode_b_args *args) {
|
2013-07-24 00:53:09 +02:00
|
|
|
const MACROBLOCKD *xd = &args->x->e_mbd;
|
|
|
|
const struct macroblockd_plane* const pd = &xd->plane[plane];
|
2013-08-27 20:05:08 +02:00
|
|
|
const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
|
2013-08-22 01:40:16 +02:00
|
|
|
const int num_4x4_w = num_4x4_blocks_wide_lookup[plane_bsize];
|
|
|
|
const int num_4x4_h = num_4x4_blocks_high_lookup[plane_bsize];
|
2013-10-10 21:11:44 +02:00
|
|
|
const MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;
|
2013-08-28 04:47:53 +02:00
|
|
|
const TX_SIZE tx_size = plane ? get_uv_tx_size(mbmi) : mbmi->tx_size;
|
2013-07-24 00:53:09 +02:00
|
|
|
|
2013-09-25 02:26:05 +02:00
|
|
|
vp9_get_entropy_contexts(tx_size, args->ctx->ta[plane], args->ctx->tl[plane],
|
|
|
|
pd->above_context, pd->left_context,
|
|
|
|
num_4x4_w, num_4x4_h);
|
2013-03-04 23:12:17 +01:00
|
|
|
}
|
2014-02-17 12:34:02 +01:00
|
|
|
|
|
|
|
static INLINE void fdct32x32(int rd_transform,
|
|
|
|
const int16_t *src, int16_t *dst, int src_stride) {
|
|
|
|
if (rd_transform)
|
|
|
|
vp9_fdct32x32_rd(src, dst, src_stride);
|
|
|
|
else
|
|
|
|
vp9_fdct32x32(src, dst, src_stride);
|
|
|
|
}
|
|
|
|
|
2014-02-09 04:30:45 +01:00
|
|
|
void vp9_xform_quant(MACROBLOCK *x, int plane, int block,
|
|
|
|
BLOCK_SIZE plane_bsize, TX_SIZE tx_size) {
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
2013-07-11 22:01:44 +02:00
|
|
|
struct macroblock_plane *const p = &x->plane[plane];
|
|
|
|
struct macroblockd_plane *const pd = &xd->plane[plane];
|
2013-08-10 01:40:05 +02:00
|
|
|
int16_t *coeff = BLOCK_OFFSET(p->coeff, block);
|
2013-11-27 03:52:10 +01:00
|
|
|
int16_t *qcoeff = BLOCK_OFFSET(p->qcoeff, block);
|
2013-08-10 01:40:05 +02:00
|
|
|
int16_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2013-12-13 20:05:26 +01:00
|
|
|
const scan_order *scan_order;
|
2013-12-04 02:59:32 +01:00
|
|
|
uint16_t *eob = &p->eobs[block];
|
2013-11-22 20:45:30 +01:00
|
|
|
const int diff_stride = 4 * num_4x4_blocks_wide_lookup[plane_bsize];
|
|
|
|
int i, j;
|
2013-07-11 22:01:44 +02:00
|
|
|
int16_t *src_diff;
|
2013-11-22 20:45:30 +01:00
|
|
|
txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &i, &j);
|
|
|
|
src_diff = &p->src_diff[4 * (j * diff_stride + i)];
|
2013-07-11 22:01:44 +02:00
|
|
|
|
|
|
|
switch (tx_size) {
|
2013-04-30 20:29:27 +02:00
|
|
|
case TX_32X32:
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order = &vp9_default_scan_orders[TX_32X32];
|
2014-02-17 12:34:02 +01:00
|
|
|
fdct32x32(x->use_lp32x32fdct, src_diff, coeff, diff_stride);
|
2013-07-11 22:01:44 +02:00
|
|
|
vp9_quantize_b_32x32(coeff, 1024, x->skip_block, p->zbin, p->round,
|
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2013-12-13 20:05:26 +01:00
|
|
|
pd->dequant, p->zbin_extra, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order = &vp9_default_scan_orders[TX_16X16];
|
2013-11-22 20:45:30 +01:00
|
|
|
vp9_fdct16x16(src_diff, coeff, diff_stride);
|
2013-07-11 22:01:44 +02:00
|
|
|
vp9_quantize_b(coeff, 256, x->skip_block, p->zbin, p->round,
|
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2013-12-13 20:05:26 +01:00
|
|
|
pd->dequant, p->zbin_extra, eob,
|
|
|
|
scan_order->scan, scan_order->iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order = &vp9_default_scan_orders[TX_8X8];
|
2013-11-22 20:45:30 +01:00
|
|
|
vp9_fdct8x8(src_diff, coeff, diff_stride);
|
2013-07-11 22:01:44 +02:00
|
|
|
vp9_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round,
|
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2013-12-13 20:05:26 +01:00
|
|
|
pd->dequant, p->zbin_extra, eob,
|
|
|
|
scan_order->scan, scan_order->iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order = &vp9_default_scan_orders[TX_4X4];
|
2013-11-22 20:45:30 +01:00
|
|
|
x->fwd_txm4x4(src_diff, coeff, diff_stride);
|
2013-07-11 22:01:44 +02:00
|
|
|
vp9_quantize_b(coeff, 16, x->skip_block, p->zbin, p->round,
|
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2013-12-13 20:05:26 +01:00
|
|
|
pd->dequant, p->zbin_extra, eob,
|
|
|
|
scan_order->scan, scan_order->iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
assert(0);
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2013-05-03 02:05:14 +02:00
|
|
|
}
|
|
|
|
|
2013-08-27 20:05:08 +02:00
|
|
|
static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize,
|
2013-08-16 02:03:03 +02:00
|
|
|
TX_SIZE tx_size, void *arg) {
|
2013-05-31 21:30:32 +02:00
|
|
|
struct encode_b_args *const args = arg;
|
|
|
|
MACROBLOCK *const x = args->x;
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
2013-10-30 21:52:55 +01:00
|
|
|
struct optimize_ctx *const ctx = args->ctx;
|
2013-12-04 02:59:32 +01:00
|
|
|
struct macroblock_plane *const p = &x->plane[plane];
|
2013-05-31 21:30:32 +02:00
|
|
|
struct macroblockd_plane *const pd = &xd->plane[plane];
|
2013-08-10 01:40:05 +02:00
|
|
|
int16_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2013-11-14 04:33:12 +01:00
|
|
|
int i, j;
|
|
|
|
uint8_t *dst;
|
|
|
|
txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &i, &j);
|
|
|
|
dst = &pd->dst.buf[4 * j * pd->dst.stride + 4 * i];
|
2013-09-21 01:29:24 +02:00
|
|
|
|
|
|
|
// TODO(jingning): per transformed block zero forcing only enabled for
|
|
|
|
// luma component. will integrate chroma components as well.
|
|
|
|
if (x->zcoeff_blk[tx_size][block] && plane == 0) {
|
2013-12-04 02:59:32 +01:00
|
|
|
p->eobs[block] = 0;
|
2013-11-06 20:34:06 +01:00
|
|
|
ctx->ta[plane][i] = 0;
|
2013-11-07 23:56:58 +01:00
|
|
|
ctx->tl[plane][j] = 0;
|
2013-09-21 01:29:24 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-11-07 23:56:58 +01:00
|
|
|
if (!x->skip_recode)
|
2014-02-09 04:30:45 +01:00
|
|
|
vp9_xform_quant(x, plane, block, plane_bsize, tx_size);
|
2013-05-03 02:05:14 +02:00
|
|
|
|
2013-11-07 23:56:58 +01:00
|
|
|
if (x->optimize && (!x->skip_recode || !x->skip_optimize)) {
|
2014-02-26 02:23:01 +01:00
|
|
|
optimize_b(plane, block, plane_bsize, tx_size, x, ctx);
|
2013-11-06 06:07:08 +01:00
|
|
|
} else {
|
2013-12-04 02:59:32 +01:00
|
|
|
ctx->ta[plane][i] = p->eobs[block] > 0;
|
|
|
|
ctx->tl[plane][j] = p->eobs[block] > 0;
|
2013-11-06 06:07:08 +01:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2014-01-15 02:58:25 +01:00
|
|
|
if (p->eobs[block])
|
2014-02-13 02:44:12 +01:00
|
|
|
*(args->skip) = 0;
|
2014-01-15 02:58:25 +01:00
|
|
|
|
2013-12-04 02:59:32 +01:00
|
|
|
if (x->skip_encode || p->eobs[block] == 0)
|
2013-07-23 19:02:43 +02:00
|
|
|
return;
|
2013-07-15 20:28:46 +02:00
|
|
|
|
2013-08-14 20:39:31 +02:00
|
|
|
switch (tx_size) {
|
2013-04-30 20:29:27 +02:00
|
|
|
case TX_32X32:
|
2013-12-04 02:59:32 +01:00
|
|
|
vp9_idct32x32_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2013-12-04 02:59:32 +01:00
|
|
|
vp9_idct16x16_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2013-12-04 02:59:32 +01:00
|
|
|
vp9_idct8x8_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
2013-07-11 18:09:41 +02:00
|
|
|
// this is like vp9_short_idct4x4 but has a special case around eob<=1
|
|
|
|
// which is significant (not just an optimization) for the lossless
|
|
|
|
// case.
|
2013-12-04 02:59:32 +01:00
|
|
|
xd->itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
2013-08-14 20:39:31 +02:00
|
|
|
default:
|
2013-12-13 04:44:08 +01:00
|
|
|
assert(0 && "Invalid transform size");
|
2013-04-30 20:29:27 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2013-10-23 20:09:27 +02:00
|
|
|
static void encode_block_pass1(int plane, int block, BLOCK_SIZE plane_bsize,
|
|
|
|
TX_SIZE tx_size, void *arg) {
|
|
|
|
struct encode_b_args *const args = arg;
|
|
|
|
MACROBLOCK *const x = args->x;
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
2013-12-04 02:59:32 +01:00
|
|
|
struct macroblock_plane *const p = &x->plane[plane];
|
2013-10-23 20:09:27 +02:00
|
|
|
struct macroblockd_plane *const pd = &xd->plane[plane];
|
|
|
|
int16_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2013-11-14 22:45:51 +01:00
|
|
|
int i, j;
|
|
|
|
uint8_t *dst;
|
|
|
|
txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &i, &j);
|
|
|
|
dst = &pd->dst.buf[4 * j * pd->dst.stride + 4 * i];
|
2013-10-23 20:09:27 +02:00
|
|
|
|
2014-02-09 04:30:45 +01:00
|
|
|
vp9_xform_quant(x, plane, block, plane_bsize, tx_size);
|
2013-10-23 20:09:27 +02:00
|
|
|
|
2013-12-04 02:59:32 +01:00
|
|
|
if (p->eobs[block] == 0)
|
2013-10-23 20:09:27 +02:00
|
|
|
return;
|
|
|
|
|
2013-12-04 02:59:32 +01:00
|
|
|
xd->itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
|
2013-10-23 20:09:27 +02:00
|
|
|
}
|
|
|
|
|
2013-08-27 20:05:08 +02:00
|
|
|
void vp9_encode_sby(MACROBLOCK *x, BLOCK_SIZE bsize) {
|
2013-05-31 21:30:32 +02:00
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
2013-05-03 02:05:14 +02:00
|
|
|
struct optimize_ctx ctx;
|
2014-01-15 02:58:25 +01:00
|
|
|
MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;
|
2014-02-13 02:44:12 +01:00
|
|
|
struct encode_b_args arg = {x, &ctx, &mbmi->skip};
|
2013-05-03 02:05:14 +02:00
|
|
|
|
2014-02-17 13:57:40 +01:00
|
|
|
vp9_subtract_plane(x, bsize, 0);
|
2013-05-03 02:05:14 +02:00
|
|
|
if (x->optimize)
|
2013-07-24 00:53:09 +02:00
|
|
|
optimize_init_b(0, bsize, &arg);
|
2013-05-03 02:05:14 +02:00
|
|
|
|
2014-02-01 02:35:53 +01:00
|
|
|
vp9_foreach_transformed_block_in_plane(xd, bsize, 0, encode_block_pass1,
|
|
|
|
&arg);
|
2013-05-03 02:05:14 +02:00
|
|
|
}
|
|
|
|
|
2013-08-27 20:05:08 +02:00
|
|
|
void vp9_encode_sb(MACROBLOCK *x, BLOCK_SIZE bsize) {
|
2013-05-31 21:30:32 +02:00
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
2013-04-30 20:29:27 +02:00
|
|
|
struct optimize_ctx ctx;
|
2014-01-15 02:58:25 +01:00
|
|
|
MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;
|
2014-02-13 02:44:12 +01:00
|
|
|
struct encode_b_args arg = {x, &ctx, &mbmi->skip};
|
2014-02-17 13:57:40 +01:00
|
|
|
int plane;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2014-02-17 13:57:40 +01:00
|
|
|
for (plane = 0; plane < MAX_MB_PLANE; ++plane) {
|
|
|
|
if (!x->skip_recode)
|
|
|
|
vp9_subtract_plane(x, bsize, plane);
|
2013-07-24 00:53:09 +02:00
|
|
|
|
2014-02-17 13:57:40 +01:00
|
|
|
if (x->optimize && (!x->skip_recode || !x->skip_optimize))
|
|
|
|
optimize_init_b(plane, bsize, &arg);
|
2013-05-14 17:58:13 +02:00
|
|
|
|
2014-02-17 13:57:40 +01:00
|
|
|
vp9_foreach_transformed_block_in_plane(xd, bsize, plane, encode_block,
|
|
|
|
&arg);
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2013-05-16 02:21:15 +02:00
|
|
|
|
2014-02-09 04:30:45 +01:00
|
|
|
static void encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
|
|
|
|
TX_SIZE tx_size, void *arg) {
|
2013-05-16 02:21:15 +02:00
|
|
|
struct encode_b_args* const args = arg;
|
2013-05-31 21:30:32 +02:00
|
|
|
MACROBLOCK *const x = args->x;
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
2013-10-10 21:11:44 +02:00
|
|
|
MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;
|
2013-05-31 21:30:32 +02:00
|
|
|
struct macroblock_plane *const p = &x->plane[plane];
|
|
|
|
struct macroblockd_plane *const pd = &xd->plane[plane];
|
2013-08-10 01:40:05 +02:00
|
|
|
int16_t *coeff = BLOCK_OFFSET(p->coeff, block);
|
2013-11-27 03:52:10 +01:00
|
|
|
int16_t *qcoeff = BLOCK_OFFSET(p->qcoeff, block);
|
2013-08-10 01:40:05 +02:00
|
|
|
int16_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2013-12-13 20:05:26 +01:00
|
|
|
const scan_order *scan_order;
|
2013-05-16 02:21:15 +02:00
|
|
|
TX_TYPE tx_type;
|
2013-07-11 20:35:13 +02:00
|
|
|
MB_PREDICTION_MODE mode;
|
2013-11-20 22:58:21 +01:00
|
|
|
const int bwl = b_width_log2(plane_bsize);
|
|
|
|
const int diff_stride = 4 * (1 << bwl);
|
2013-07-11 20:35:13 +02:00
|
|
|
uint8_t *src, *dst;
|
|
|
|
int16_t *src_diff;
|
2013-12-04 02:59:32 +01:00
|
|
|
uint16_t *eob = &p->eobs[block];
|
2014-02-17 12:34:02 +01:00
|
|
|
const int src_stride = p->src.stride;
|
|
|
|
const int dst_stride = pd->dst.stride;
|
2013-11-20 22:58:21 +01:00
|
|
|
int i, j;
|
|
|
|
txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &i, &j);
|
2014-02-17 12:34:02 +01:00
|
|
|
dst = &pd->dst.buf[4 * (j * dst_stride + i)];
|
|
|
|
src = &p->src.buf[4 * (j * src_stride + i)];
|
2013-11-20 22:58:21 +01:00
|
|
|
src_diff = &p->src_diff[4 * (j * diff_stride + i)];
|
2013-05-16 02:21:15 +02:00
|
|
|
|
2013-05-31 21:30:32 +02:00
|
|
|
// if (x->optimize)
|
2014-02-26 02:23:01 +01:00
|
|
|
// optimize_b(plane, block, plane_bsize, tx_size, x, args->ctx);
|
2013-05-31 21:30:32 +02:00
|
|
|
|
2013-07-11 20:35:13 +02:00
|
|
|
switch (tx_size) {
|
2013-05-16 02:21:15 +02:00
|
|
|
case TX_32X32:
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order = &vp9_default_scan_orders[TX_32X32];
|
2013-07-11 20:35:13 +02:00
|
|
|
mode = plane == 0 ? mbmi->mode : mbmi->uv_mode;
|
2013-12-12 00:26:45 +01:00
|
|
|
vp9_predict_intra_block(xd, block >> 6, bwl, TX_32X32, mode,
|
2013-12-03 03:44:08 +01:00
|
|
|
x->skip_encode ? src : dst,
|
2014-02-17 12:34:02 +01:00
|
|
|
x->skip_encode ? src_stride : dst_stride,
|
|
|
|
dst, dst_stride, i, j, plane);
|
2013-11-07 23:56:58 +01:00
|
|
|
if (!x->skip_recode) {
|
2013-11-20 22:58:21 +01:00
|
|
|
vp9_subtract_block(32, 32, src_diff, diff_stride,
|
2014-02-17 12:34:02 +01:00
|
|
|
src, src_stride, dst, dst_stride);
|
|
|
|
fdct32x32(x->use_lp32x32fdct, src_diff, coeff, diff_stride);
|
2013-11-07 23:56:58 +01:00
|
|
|
vp9_quantize_b_32x32(coeff, 1024, x->skip_block, p->zbin, p->round,
|
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2013-12-13 20:05:26 +01:00
|
|
|
pd->dequant, p->zbin_extra, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2013-11-07 23:56:58 +01:00
|
|
|
}
|
2013-07-23 19:02:43 +02:00
|
|
|
if (!x->skip_encode && *eob)
|
2014-02-17 12:34:02 +01:00
|
|
|
vp9_idct32x32_add(dqcoeff, dst, dst_stride, *eob);
|
2013-05-16 02:21:15 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2013-07-24 21:55:45 +02:00
|
|
|
tx_type = get_tx_type_16x16(pd->plane_type, xd);
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order = &vp9_scan_orders[TX_16X16][tx_type];
|
2013-07-11 20:35:13 +02:00
|
|
|
mode = plane == 0 ? mbmi->mode : mbmi->uv_mode;
|
2013-12-12 00:26:45 +01:00
|
|
|
vp9_predict_intra_block(xd, block >> 4, bwl, TX_16X16, mode,
|
2013-12-03 03:44:08 +01:00
|
|
|
x->skip_encode ? src : dst,
|
2014-02-17 12:34:02 +01:00
|
|
|
x->skip_encode ? src_stride : dst_stride,
|
|
|
|
dst, dst_stride, i, j, plane);
|
2013-11-07 23:56:58 +01:00
|
|
|
if (!x->skip_recode) {
|
2013-11-20 22:58:21 +01:00
|
|
|
vp9_subtract_block(16, 16, src_diff, diff_stride,
|
2014-02-17 12:34:02 +01:00
|
|
|
src, src_stride, dst, dst_stride);
|
2014-02-06 20:54:15 +01:00
|
|
|
vp9_fht16x16(src_diff, coeff, diff_stride, tx_type);
|
2013-11-07 23:56:58 +01:00
|
|
|
vp9_quantize_b(coeff, 256, x->skip_block, p->zbin, p->round,
|
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2013-12-13 20:05:26 +01:00
|
|
|
pd->dequant, p->zbin_extra, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2013-11-07 23:56:58 +01:00
|
|
|
}
|
2013-10-02 23:13:33 +02:00
|
|
|
if (!x->skip_encode && *eob)
|
2014-02-17 12:34:02 +01:00
|
|
|
vp9_iht16x16_add(tx_type, dqcoeff, dst, dst_stride, *eob);
|
2013-05-16 02:21:15 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2013-07-24 21:55:45 +02:00
|
|
|
tx_type = get_tx_type_8x8(pd->plane_type, xd);
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order = &vp9_scan_orders[TX_8X8][tx_type];
|
2013-07-11 20:35:13 +02:00
|
|
|
mode = plane == 0 ? mbmi->mode : mbmi->uv_mode;
|
2013-12-12 00:26:45 +01:00
|
|
|
vp9_predict_intra_block(xd, block >> 2, bwl, TX_8X8, mode,
|
2013-12-03 03:44:08 +01:00
|
|
|
x->skip_encode ? src : dst,
|
2014-02-17 12:34:02 +01:00
|
|
|
x->skip_encode ? src_stride : dst_stride,
|
|
|
|
dst, dst_stride, i, j, plane);
|
2013-11-07 23:56:58 +01:00
|
|
|
if (!x->skip_recode) {
|
2013-11-20 22:58:21 +01:00
|
|
|
vp9_subtract_block(8, 8, src_diff, diff_stride,
|
2014-02-17 12:34:02 +01:00
|
|
|
src, src_stride, dst, dst_stride);
|
2014-02-06 20:54:15 +01:00
|
|
|
vp9_fht8x8(src_diff, coeff, diff_stride, tx_type);
|
2013-11-07 23:56:58 +01:00
|
|
|
vp9_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round, p->quant,
|
|
|
|
p->quant_shift, qcoeff, dqcoeff,
|
2013-12-13 20:05:26 +01:00
|
|
|
pd->dequant, p->zbin_extra, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2013-11-07 23:56:58 +01:00
|
|
|
}
|
2013-10-02 23:13:33 +02:00
|
|
|
if (!x->skip_encode && *eob)
|
2014-02-17 12:34:02 +01:00
|
|
|
vp9_iht8x8_add(tx_type, dqcoeff, dst, dst_stride, *eob);
|
2013-05-16 02:21:15 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
2013-07-24 21:55:45 +02:00
|
|
|
tx_type = get_tx_type_4x4(pd->plane_type, xd, block);
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order = &vp9_scan_orders[TX_4X4][tx_type];
|
2013-08-02 20:45:21 +02:00
|
|
|
if (mbmi->sb_type < BLOCK_8X8 && plane == 0)
|
2013-10-10 21:11:44 +02:00
|
|
|
mode = xd->mi_8x8[0]->bmi[block].as_mode;
|
2013-08-02 20:45:21 +02:00
|
|
|
else
|
2013-07-11 20:35:13 +02:00
|
|
|
mode = plane == 0 ? mbmi->mode : mbmi->uv_mode;
|
2013-08-02 20:45:21 +02:00
|
|
|
|
2013-07-11 20:35:13 +02:00
|
|
|
vp9_predict_intra_block(xd, block, bwl, TX_4X4, mode,
|
2013-12-03 03:44:08 +01:00
|
|
|
x->skip_encode ? src : dst,
|
2014-02-17 12:34:02 +01:00
|
|
|
x->skip_encode ? src_stride : dst_stride,
|
|
|
|
dst, dst_stride, i, j, plane);
|
2013-11-07 23:56:58 +01:00
|
|
|
|
|
|
|
if (!x->skip_recode) {
|
2013-11-20 22:58:21 +01:00
|
|
|
vp9_subtract_block(4, 4, src_diff, diff_stride,
|
2014-02-17 12:34:02 +01:00
|
|
|
src, src_stride, dst, dst_stride);
|
2013-11-07 23:56:58 +01:00
|
|
|
if (tx_type != DCT_DCT)
|
2014-02-06 20:54:15 +01:00
|
|
|
vp9_fht4x4(src_diff, coeff, diff_stride, tx_type);
|
2013-11-07 23:56:58 +01:00
|
|
|
else
|
2013-11-20 22:58:21 +01:00
|
|
|
x->fwd_txm4x4(src_diff, coeff, diff_stride);
|
2013-11-07 23:56:58 +01:00
|
|
|
vp9_quantize_b(coeff, 16, x->skip_block, p->zbin, p->round, p->quant,
|
|
|
|
p->quant_shift, qcoeff, dqcoeff,
|
2013-12-13 20:05:26 +01:00
|
|
|
pd->dequant, p->zbin_extra, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2013-11-07 23:56:58 +01:00
|
|
|
}
|
|
|
|
|
2013-07-23 19:02:43 +02:00
|
|
|
if (!x->skip_encode && *eob) {
|
2013-07-11 20:35:13 +02:00
|
|
|
if (tx_type == DCT_DCT)
|
|
|
|
// this is like vp9_short_idct4x4 but has a special case around eob<=1
|
|
|
|
// which is significant (not just an optimization) for the lossless
|
|
|
|
// case.
|
2014-02-17 12:34:02 +01:00
|
|
|
xd->itxm_add(dqcoeff, dst, dst_stride, *eob);
|
2013-07-11 20:35:13 +02:00
|
|
|
else
|
2014-02-17 12:34:02 +01:00
|
|
|
vp9_iht4x4_16_add(dqcoeff, dst, dst_stride, tx_type);
|
2013-07-11 20:35:13 +02:00
|
|
|
}
|
2013-05-16 02:21:15 +02:00
|
|
|
break;
|
2013-07-11 20:35:13 +02:00
|
|
|
default:
|
|
|
|
assert(0);
|
2013-05-16 02:21:15 +02:00
|
|
|
}
|
2014-01-15 02:58:25 +01:00
|
|
|
if (*eob)
|
2014-02-13 02:44:12 +01:00
|
|
|
*(args->skip) = 0;
|
2013-05-16 02:21:15 +02:00
|
|
|
}
|
|
|
|
|
2014-02-09 04:30:45 +01:00
|
|
|
void vp9_encode_block_intra(MACROBLOCK *x, int plane, int block,
|
|
|
|
BLOCK_SIZE plane_bsize, TX_SIZE tx_size,
|
2014-02-13 02:44:12 +01:00
|
|
|
unsigned char *skip) {
|
|
|
|
struct encode_b_args arg = {x, NULL, skip};
|
2014-02-09 04:30:45 +01:00
|
|
|
encode_block_intra(plane, block, plane_bsize, tx_size, &arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-02-12 03:06:00 +01:00
|
|
|
void vp9_encode_intra_block_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane) {
|
2014-02-09 04:30:45 +01:00
|
|
|
const MACROBLOCKD *const xd = &x->e_mbd;
|
2014-02-13 02:44:12 +01:00
|
|
|
struct encode_b_args arg = {x, NULL, &xd->mi_8x8[0]->mbmi.skip};
|
2013-05-16 02:21:15 +02:00
|
|
|
|
2014-02-12 03:06:00 +01:00
|
|
|
vp9_foreach_transformed_block_in_plane(xd, bsize, plane, encode_block_intra,
|
2014-02-09 04:30:45 +01:00
|
|
|
&arg);
|
2013-05-16 02:21:15 +02:00
|
|
|
}
|
|
|
|
|
2013-11-15 21:17:16 +01:00
|
|
|
int vp9_encode_intra(MACROBLOCK *x, int use_16x16_pred) {
|
|
|
|
MB_MODE_INFO * mbmi = &x->e_mbd.mi_8x8[0]->mbmi;
|
|
|
|
x->skip_encode = 0;
|
|
|
|
mbmi->mode = DC_PRED;
|
|
|
|
mbmi->ref_frame[0] = INTRA_FRAME;
|
|
|
|
mbmi->tx_size = use_16x16_pred ? (mbmi->sb_type >= BLOCK_16X16 ? TX_16X16
|
|
|
|
: TX_8X8)
|
|
|
|
: TX_4X4;
|
2014-02-12 03:06:00 +01:00
|
|
|
vp9_encode_intra_block_plane(x, mbmi->sb_type, 0);
|
2013-11-15 21:17:16 +01:00
|
|
|
return vp9_get_mb_ss(x->plane[0].src_diff);
|
|
|
|
}
|