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"
|
2015-07-06 18:33:27 +02:00
|
|
|
#include "./vpx_dsp_rtcd.h"
|
2013-10-02 23:13:33 +02:00
|
|
|
|
2015-07-17 21:05:42 +02:00
|
|
|
#include "vpx_dsp/quantize.h"
|
2013-10-02 23:13:33 +02:00
|
|
|
#include "vpx_mem/vpx_mem.h"
|
2015-05-12 04:09:22 +02:00
|
|
|
#include "vpx_ports/mem.h"
|
2013-10-02 23:13:33 +02:00
|
|
|
|
|
|
|
#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"
|
2015-05-22 20:19:51 +02:00
|
|
|
#include "vp9/common/vp9_scan.h"
|
2013-10-02 23:13:33 +02:00
|
|
|
|
|
|
|
#include "vp9/encoder/vp9_encodemb.h"
|
2014-07-02 21:36:48 +02:00
|
|
|
#include "vp9/encoder/vp9_rd.h"
|
2013-10-02 23:13:33 +02:00
|
|
|
#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];
|
|
|
|
};
|
|
|
|
|
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
|
|
|
|
2014-09-24 15:36:34 +02:00
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
if (x->e_mbd.cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
|
2015-07-06 18:33:27 +02:00
|
|
|
vpx_highbd_subtract_block(bh, bw, p->src_diff, bw, p->src.buf,
|
2014-10-08 21:43:22 +02:00
|
|
|
p->src.stride, pd->dst.buf, pd->dst.stride,
|
|
|
|
x->e_mbd.bd);
|
2014-09-24 15:36:34 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
2015-07-06 18:33:27 +02:00
|
|
|
vpx_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
|
|
|
}
|
|
|
|
|
2014-04-11 02:45:07 +02:00
|
|
|
typedef struct vp9_token_state {
|
2016-07-27 05:43:23 +02:00
|
|
|
int64_t error;
|
|
|
|
int rate;
|
|
|
|
int16_t next;
|
|
|
|
int16_t token;
|
|
|
|
tran_low_t qc;
|
|
|
|
tran_low_t dqc;
|
|
|
|
uint8_t best_index;
|
2014-04-11 02:45:07 +02:00
|
|
|
} 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
|
|
|
|
2016-07-27 05:43:23 +02:00
|
|
|
static const int plane_rd_mult[REF_TYPES][PLANE_TYPES] = {
|
|
|
|
{ 10, 6 }, { 8, 5 },
|
|
|
|
};
|
2010-10-01 05:41:37 +02:00
|
|
|
|
2016-07-27 05:43:23 +02:00
|
|
|
#define UPDATE_RD_COST() \
|
|
|
|
{ \
|
|
|
|
rd_cost0 = RDCOST(rdmult, rddiv, rate0, error0); \
|
|
|
|
rd_cost1 = RDCOST(rdmult, rddiv, rate1, error1); \
|
|
|
|
}
|
2012-08-11 00:34:31 +02:00
|
|
|
|
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.
|
2016-07-27 05:43:23 +02:00
|
|
|
static int trellis_get_coeff_context(const int16_t *scan, const int16_t *nb,
|
|
|
|
int idx, int token, 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
|
|
|
}
|
|
|
|
|
2016-07-27 05:43:23 +02:00
|
|
|
int vp9_optimize_b(MACROBLOCK *mb, int plane, int block, TX_SIZE tx_size,
|
|
|
|
int ctx) {
|
2013-02-27 19:00:24 +01:00
|
|
|
MACROBLOCKD *const xd = &mb->e_mbd;
|
2014-04-11 02:45:07 +02:00
|
|
|
struct macroblock_plane *const p = &mb->plane[plane];
|
|
|
|
struct macroblockd_plane *const pd = &xd->plane[plane];
|
2016-01-20 01:40:20 +01:00
|
|
|
const int ref = is_inter_block(xd->mi[0]);
|
2013-03-04 23:12:17 +01:00
|
|
|
vp9_token_state tokens[1025][2];
|
2014-04-11 02:45:07 +02:00
|
|
|
uint8_t token_cache[1024];
|
2014-09-03 01:34:09 +02:00
|
|
|
const tran_low_t *const coeff = BLOCK_OFFSET(mb->plane[plane].coeff, block);
|
|
|
|
tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);
|
|
|
|
tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2014-04-11 02:45:07 +02:00
|
|
|
const int eob = p->eobs[block];
|
2015-09-29 19:40:27 +02:00
|
|
|
const PLANE_TYPE type = get_plane_type(plane);
|
2013-09-19 14:53:48 +02:00
|
|
|
const int default_eob = 16 << (tx_size << 1);
|
2016-06-18 02:36:39 +02:00
|
|
|
const int shift = (tx_size == TX_32X32);
|
2016-07-27 05:43:23 +02:00
|
|
|
const int16_t *const dequant_ptr = pd->dequant;
|
|
|
|
const uint8_t *const band_translate = get_band_translate(tx_size);
|
2014-04-11 02:45:07 +02:00
|
|
|
const scan_order *const so = get_scan(xd, tx_size, type, block);
|
|
|
|
const int16_t *const scan = so->scan;
|
|
|
|
const int16_t *const nb = so->neighbors;
|
2016-06-18 02:36:39 +02:00
|
|
|
const int dq_step[2] = { dequant_ptr[0] >> shift, dequant_ptr[1] >> shift };
|
2014-04-11 02:45:07 +02:00
|
|
|
int next = eob, sz = 0;
|
2016-04-25 23:23:06 +02:00
|
|
|
const int64_t rdmult = (mb->rdmult * plane_rd_mult[ref][type]) >> 1;
|
|
|
|
const int64_t rddiv = mb->rddiv;
|
2014-04-11 02:45:07 +02:00
|
|
|
int64_t rd_cost0, rd_cost1;
|
2016-06-17 23:52:05 +02:00
|
|
|
int rate0, rate1;
|
|
|
|
int64_t error0, error1;
|
2014-12-24 00:06:17 +01:00
|
|
|
int16_t t0, t1;
|
|
|
|
EXTRABIT e0;
|
2016-12-14 01:22:48 +01:00
|
|
|
unsigned int(*const token_costs)[2][COEFF_CONTEXTS][ENTROPY_TOKENS] =
|
|
|
|
mb->token_costs[tx_size][type][ref];
|
2014-04-11 02:45:07 +02:00
|
|
|
int best, band, pt, i, final_eob;
|
2014-12-24 00:06:17 +01:00
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
2016-01-13 23:21:30 +01:00
|
|
|
const int *cat6_high_cost = vp9_get_high_cost_table(xd->bd);
|
2014-12-24 00:06:17 +01:00
|
|
|
#else
|
2016-01-13 23:21:30 +01:00
|
|
|
const int *cat6_high_cost = vp9_get_high_cost_table(8);
|
2014-12-24 00:06:17 +01:00
|
|
|
#endif
|
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. */
|
|
|
|
/* 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;
|
2014-04-11 02:45:07 +02:00
|
|
|
tokens[eob][1] = tokens[eob][0];
|
|
|
|
|
2013-03-27 00:46:09 +01:00
|
|
|
for (i = 0; i < eob; i++)
|
2016-07-27 05:43:23 +02:00
|
|
|
token_cache[scan[i]] = vp9_pt_energy_class[vp9_get_token(qcoeff[scan[i]])];
|
2013-03-27 00:46:09 +01:00
|
|
|
|
2014-04-11 02:45:07 +02:00
|
|
|
for (i = eob; i-- > 0;) {
|
2012-12-03 23:53:45 +01:00
|
|
|
int base_bits, d2, dx;
|
2014-04-11 02:45:07 +02:00
|
|
|
const int rc = scan[i];
|
|
|
|
int 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;
|
2014-12-24 00:06:17 +01:00
|
|
|
vp9_get_token_extra(x, &t0, &e0);
|
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);
|
2016-12-14 01:22:48 +01:00
|
|
|
rate0 += token_costs[band][0][pt][tokens[next][0].token];
|
|
|
|
rate1 += token_costs[band][0][pt][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;
|
2014-12-24 00:06:17 +01:00
|
|
|
base_bits = vp9_get_cost(t0, e0, cat6_high_cost);
|
2016-06-18 02:11:01 +02:00
|
|
|
dx = (dqcoeff[rc] - coeff[rc]) * (1 << shift);
|
2014-09-24 15:36:34 +02:00
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
|
|
|
|
dx >>= xd->bd - 8;
|
|
|
|
}
|
|
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
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;
|
2016-06-18 02:36:39 +02:00
|
|
|
tokens[i][0].dqc = dqcoeff[rc];
|
2016-07-29 21:06:49 +02:00
|
|
|
tokens[i][0].best_index = 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;
|
|
|
|
|
2016-06-18 02:11:01 +02:00
|
|
|
if ((abs(x) * dequant_ptr[rc != 0] > (abs(coeff[rc]) << shift)) &&
|
2016-07-27 05:43:23 +02:00
|
|
|
(abs(x) * dequant_ptr[rc != 0] <
|
|
|
|
(abs(coeff[rc]) << shift) + 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;
|
2016-06-18 02:11:01 +02:00
|
|
|
} else {
|
|
|
|
tokens[i][1] = tokens[i][0];
|
|
|
|
next = i;
|
|
|
|
continue;
|
2012-07-14 00:21:29 +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.
|
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;
|
2014-12-24 00:06:17 +01:00
|
|
|
e0 = 0;
|
2012-07-14 00:21:29 +02:00
|
|
|
} else {
|
2014-12-24 00:06:17 +01:00
|
|
|
vp9_get_token_extra(x, &t0, &e0);
|
|
|
|
t1 = t0;
|
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);
|
2016-12-14 01:22:48 +01:00
|
|
|
rate0 += token_costs[band][!x][pt][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);
|
2016-12-14 01:22:48 +01:00
|
|
|
rate1 += token_costs[band][!x][pt][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;
|
2014-12-24 00:06:17 +01:00
|
|
|
base_bits = vp9_get_cost(t0, e0, cat6_high_cost);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
if (shortcut) {
|
2014-09-24 15:36:34 +02:00
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
|
|
|
|
dx -= ((dequant_ptr[rc != 0] >> (xd->bd - 8)) + sz) ^ sz;
|
|
|
|
} else {
|
|
|
|
dx -= (dequant_ptr[rc != 0] + sz) ^ sz;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
dx -= (dequant_ptr[rc != 0] + sz) ^ sz;
|
|
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
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;
|
2016-06-18 02:36:39 +02:00
|
|
|
|
|
|
|
if (x) {
|
|
|
|
tran_low_t offset = dq_step[rc != 0];
|
|
|
|
// The 32x32 transform coefficient uses half quantization step size.
|
|
|
|
// Account for the rounding difference in the dequantized coefficeint
|
|
|
|
// value when the quantization index is dropped from an even number
|
|
|
|
// to an odd number.
|
2016-07-27 05:43:23 +02:00
|
|
|
if (shift & x) offset += (dequant_ptr[rc != 0] & 0x01);
|
2016-06-18 02:36:39 +02:00
|
|
|
|
|
|
|
if (sz == 0)
|
|
|
|
tokens[i][1].dqc = dqcoeff[rc] - offset;
|
|
|
|
else
|
|
|
|
tokens[i][1].dqc = dqcoeff[rc] + offset;
|
|
|
|
} else {
|
|
|
|
tokens[i][1].dqc = 0;
|
|
|
|
}
|
|
|
|
|
2016-07-29 21:06:49 +02:00
|
|
|
tokens[i][1].best_index = 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];
|
2016-07-06 21:46:48 +02:00
|
|
|
pt = get_coef_context(nb, token_cache, 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) {
|
2016-12-14 01:22:48 +01:00
|
|
|
tokens[next][0].rate += token_costs[band][1][pt][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) {
|
2016-12-14 01:22:48 +01:00
|
|
|
tokens[next][1].rate += token_costs[band][1][pt][t1];
|
2012-07-14 00:21:29 +02:00
|
|
|
tokens[next][1].token = ZERO_TOKEN;
|
|
|
|
}
|
2016-07-29 21:06:49 +02:00
|
|
|
tokens[i][0].best_index = tokens[i][1].best_index = 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];
|
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;
|
2016-12-14 01:22:48 +01:00
|
|
|
rate0 += token_costs[band][0][ctx][t0];
|
|
|
|
rate1 += token_costs[band][0][ctx][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;
|
2014-04-11 02:45:07 +02:00
|
|
|
final_eob = -1;
|
2016-06-18 02:36:39 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
for (i = next; i < eob; i = next) {
|
2014-04-11 02:45:07 +02:00
|
|
|
const int x = tokens[i][best].qc;
|
|
|
|
const int rc = scan[i];
|
2016-06-18 02:36:39 +02:00
|
|
|
if (x) final_eob = i;
|
2014-02-14 02:40:10 +01:00
|
|
|
qcoeff[rc] = x;
|
2016-06-18 02:36:39 +02:00
|
|
|
dqcoeff[rc] = tokens[i][best].dqc;
|
2012-07-14 00:21:29 +02:00
|
|
|
next = tokens[i][best].next;
|
2016-07-29 21:06:49 +02:00
|
|
|
best = tokens[i][best].best_index;
|
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;
|
2014-04-10 20:19:38 +02:00
|
|
|
return final_eob;
|
2011-10-25 19:25:02 +02:00
|
|
|
}
|
|
|
|
|
2016-07-27 05:43:23 +02:00
|
|
|
static INLINE void fdct32x32(int rd_transform, const int16_t *src,
|
|
|
|
tran_low_t *dst, int src_stride) {
|
2014-02-17 12:34:02 +01:00
|
|
|
if (rd_transform)
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_fdct32x32_rd(src, dst, src_stride);
|
2014-02-17 12:34:02 +01:00
|
|
|
else
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_fdct32x32(src, dst, src_stride);
|
2014-02-17 12:34:02 +01:00
|
|
|
}
|
|
|
|
|
2014-09-03 01:34:09 +02:00
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
2014-10-08 21:43:22 +02:00
|
|
|
static INLINE void highbd_fdct32x32(int rd_transform, const int16_t *src,
|
|
|
|
tran_low_t *dst, int src_stride) {
|
2014-09-03 01:34:09 +02:00
|
|
|
if (rd_transform)
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct32x32_rd(src, dst, src_stride);
|
2014-09-03 01:34:09 +02:00
|
|
|
else
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct32x32(src, dst, src_stride);
|
2014-09-03 01:34:09 +02:00
|
|
|
}
|
2014-09-24 15:36:34 +02:00
|
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
2014-09-03 01:34:09 +02:00
|
|
|
|
2016-07-01 21:20:45 +02:00
|
|
|
void vp9_xform_quant_fp(MACROBLOCK *x, int plane, int block, int row, int col,
|
2014-05-30 03:14:17 +02:00
|
|
|
BLOCK_SIZE plane_bsize, TX_SIZE tx_size) {
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
|
|
|
const struct macroblock_plane *const p = &x->plane[plane];
|
|
|
|
const struct macroblockd_plane *const pd = &xd->plane[plane];
|
2014-07-02 01:10:44 +02:00
|
|
|
const scan_order *const scan_order = &vp9_default_scan_orders[tx_size];
|
2014-09-03 01:34:09 +02:00
|
|
|
tran_low_t *const coeff = BLOCK_OFFSET(p->coeff, block);
|
|
|
|
tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);
|
|
|
|
tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2014-07-02 01:10:44 +02:00
|
|
|
uint16_t *const eob = &p->eobs[block];
|
|
|
|
const int diff_stride = 4 * num_4x4_blocks_wide_lookup[plane_bsize];
|
|
|
|
const int16_t *src_diff;
|
2016-07-01 21:20:45 +02:00
|
|
|
src_diff = &p->src_diff[4 * (row * diff_stride + col)];
|
2014-07-02 01:10:44 +02:00
|
|
|
|
2014-09-24 15:36:34 +02:00
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
|
|
|
|
switch (tx_size) {
|
|
|
|
case TX_32X32:
|
2014-10-08 21:43:22 +02:00
|
|
|
highbd_fdct32x32(x->use_lp32x32fdct, src_diff, coeff, diff_stride);
|
|
|
|
vp9_highbd_quantize_fp_32x32(coeff, 1024, x->skip_block, p->zbin,
|
|
|
|
p->round_fp, p->quant_fp, p->quant_shift,
|
2016-07-27 05:43:23 +02:00
|
|
|
qcoeff, dqcoeff, pd->dequant, eob,
|
|
|
|
scan_order->scan, scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct16x16(src_diff, coeff, diff_stride);
|
2014-10-08 21:43:22 +02:00
|
|
|
vp9_highbd_quantize_fp(coeff, 256, x->skip_block, p->zbin, p->round_fp,
|
|
|
|
p->quant_fp, p->quant_shift, qcoeff, dqcoeff,
|
2016-07-27 05:43:23 +02:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct8x8(src_diff, coeff, diff_stride);
|
2014-10-08 21:43:22 +02:00
|
|
|
vp9_highbd_quantize_fp(coeff, 64, x->skip_block, p->zbin, p->round_fp,
|
|
|
|
p->quant_fp, p->quant_shift, qcoeff, dqcoeff,
|
2016-07-27 05:43:23 +02:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
|
|
|
x->fwd_txm4x4(src_diff, coeff, diff_stride);
|
2014-10-08 21:43:22 +02:00
|
|
|
vp9_highbd_quantize_fp(coeff, 16, x->skip_block, p->zbin, p->round_fp,
|
|
|
|
p->quant_fp, p->quant_shift, qcoeff, dqcoeff,
|
2016-07-27 05:43:23 +02:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
2016-07-27 05:43:23 +02:00
|
|
|
default: assert(0);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
|
2014-07-02 01:10:44 +02:00
|
|
|
switch (tx_size) {
|
|
|
|
case TX_32X32:
|
|
|
|
fdct32x32(x->use_lp32x32fdct, src_diff, coeff, diff_stride);
|
2014-07-07 21:08:40 +02:00
|
|
|
vp9_quantize_fp_32x32(coeff, 1024, x->skip_block, p->zbin, p->round_fp,
|
|
|
|
p->quant_fp, p->quant_shift, qcoeff, dqcoeff,
|
2014-12-22 18:35:29 +01:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
2014-07-07 21:08:40 +02:00
|
|
|
scan_order->iscan);
|
2014-07-02 01:10:44 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_fdct16x16(src_diff, coeff, diff_stride);
|
2014-07-02 01:10:44 +02:00
|
|
|
vp9_quantize_fp(coeff, 256, x->skip_block, p->zbin, p->round_fp,
|
2016-07-27 05:43:23 +02:00
|
|
|
p->quant_fp, p->quant_shift, qcoeff, dqcoeff, pd->dequant,
|
|
|
|
eob, scan_order->scan, scan_order->iscan);
|
2014-07-02 01:10:44 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2016-07-27 05:43:23 +02:00
|
|
|
vp9_fdct8x8_quant(src_diff, diff_stride, coeff, 64, x->skip_block,
|
|
|
|
p->zbin, p->round_fp, p->quant_fp, p->quant_shift,
|
|
|
|
qcoeff, dqcoeff, pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-07-02 01:10:44 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
|
|
|
x->fwd_txm4x4(src_diff, coeff, diff_stride);
|
|
|
|
vp9_quantize_fp(coeff, 16, x->skip_block, p->zbin, p->round_fp,
|
2016-07-27 05:43:23 +02:00
|
|
|
p->quant_fp, p->quant_shift, qcoeff, dqcoeff, pd->dequant,
|
|
|
|
eob, scan_order->scan, scan_order->iscan);
|
2014-08-04 17:52:53 +02:00
|
|
|
break;
|
2016-07-27 05:43:23 +02:00
|
|
|
default: assert(0); break;
|
2014-07-02 01:10:44 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-01 21:20:45 +02:00
|
|
|
void vp9_xform_quant_dc(MACROBLOCK *x, int plane, int block, int row, int col,
|
2014-07-02 01:10:44 +02:00
|
|
|
BLOCK_SIZE plane_bsize, TX_SIZE tx_size) {
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
|
|
|
const struct macroblock_plane *const p = &x->plane[plane];
|
|
|
|
const struct macroblockd_plane *const pd = &xd->plane[plane];
|
2014-09-03 01:34:09 +02:00
|
|
|
tran_low_t *const coeff = BLOCK_OFFSET(p->coeff, block);
|
|
|
|
tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);
|
|
|
|
tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2014-05-30 03:14:17 +02:00
|
|
|
uint16_t *const eob = &p->eobs[block];
|
|
|
|
const int diff_stride = 4 * num_4x4_blocks_wide_lookup[plane_bsize];
|
|
|
|
const int16_t *src_diff;
|
2016-07-01 21:20:45 +02:00
|
|
|
src_diff = &p->src_diff[4 * (row * diff_stride + col)];
|
2014-09-24 15:36:34 +02:00
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
|
|
|
|
switch (tx_size) {
|
|
|
|
case TX_32X32:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct32x32_1(src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_dc_32x32(coeff, x->skip_block, p->round,
|
2014-10-08 21:43:22 +02:00
|
|
|
p->quant_fp[0], qcoeff, dqcoeff,
|
|
|
|
pd->dequant[0], eob);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct16x16_1(src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_dc(coeff, 256, x->skip_block, p->round,
|
2016-07-27 05:43:23 +02:00
|
|
|
p->quant_fp[0], qcoeff, dqcoeff, pd->dequant[0],
|
|
|
|
eob);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct8x8_1(src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_dc(coeff, 64, x->skip_block, p->round,
|
2016-07-27 05:43:23 +02:00
|
|
|
p->quant_fp[0], qcoeff, dqcoeff, pd->dequant[0],
|
|
|
|
eob);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
|
|
|
x->fwd_txm4x4(src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_dc(coeff, 16, x->skip_block, p->round,
|
2016-07-27 05:43:23 +02:00
|
|
|
p->quant_fp[0], qcoeff, dqcoeff, pd->dequant[0],
|
|
|
|
eob);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
2016-07-27 05:43:23 +02:00
|
|
|
default: assert(0);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
|
2014-05-30 03:14:17 +02:00
|
|
|
switch (tx_size) {
|
|
|
|
case TX_32X32:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_fdct32x32_1(src_diff, coeff, diff_stride);
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_quantize_dc_32x32(coeff, x->skip_block, p->round, p->quant_fp[0],
|
|
|
|
qcoeff, dqcoeff, pd->dequant[0], eob);
|
2014-05-30 03:14:17 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_fdct16x16_1(src_diff, coeff, diff_stride);
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_quantize_dc(coeff, 256, x->skip_block, p->round, p->quant_fp[0],
|
|
|
|
qcoeff, dqcoeff, pd->dequant[0], eob);
|
2014-05-30 03:14:17 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_fdct8x8_1(src_diff, coeff, diff_stride);
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_quantize_dc(coeff, 64, x->skip_block, p->round, p->quant_fp[0],
|
|
|
|
qcoeff, dqcoeff, pd->dequant[0], eob);
|
2014-05-30 03:14:17 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
|
|
|
x->fwd_txm4x4(src_diff, coeff, diff_stride);
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_quantize_dc(coeff, 16, x->skip_block, p->round, p->quant_fp[0],
|
|
|
|
qcoeff, dqcoeff, pd->dequant[0], eob);
|
2014-08-04 17:52:53 +02:00
|
|
|
break;
|
2016-07-27 05:43:23 +02:00
|
|
|
default: assert(0); break;
|
2014-05-30 03:14:17 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-01 21:20:45 +02:00
|
|
|
void vp9_xform_quant(MACROBLOCK *x, int plane, int block, int row, int col,
|
2014-02-09 04:30:45 +01:00
|
|
|
BLOCK_SIZE plane_bsize, TX_SIZE tx_size) {
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
2014-02-27 21:02:09 +01:00
|
|
|
const struct macroblock_plane *const p = &x->plane[plane];
|
|
|
|
const struct macroblockd_plane *const pd = &xd->plane[plane];
|
|
|
|
const scan_order *const scan_order = &vp9_default_scan_orders[tx_size];
|
2014-09-03 01:34:09 +02:00
|
|
|
tran_low_t *const coeff = BLOCK_OFFSET(p->coeff, block);
|
|
|
|
tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);
|
|
|
|
tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2014-02-27 21:02:09 +01:00
|
|
|
uint16_t *const eob = &p->eobs[block];
|
2013-11-22 20:45:30 +01:00
|
|
|
const int diff_stride = 4 * num_4x4_blocks_wide_lookup[plane_bsize];
|
2014-02-27 21:02:09 +01:00
|
|
|
const int16_t *src_diff;
|
2016-07-01 21:20:45 +02:00
|
|
|
src_diff = &p->src_diff[4 * (row * diff_stride + col)];
|
2013-07-11 22:01:44 +02:00
|
|
|
|
2014-09-24 15:36:34 +02:00
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
|
2016-07-27 05:43:23 +02:00
|
|
|
switch (tx_size) {
|
2014-09-24 15:36:34 +02:00
|
|
|
case TX_32X32:
|
2014-10-08 21:43:22 +02:00
|
|
|
highbd_fdct32x32(x->use_lp32x32fdct, src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_b_32x32(coeff, 1024, x->skip_block, p->zbin,
|
2014-10-08 21:43:22 +02:00
|
|
|
p->round, p->quant, p->quant_shift, qcoeff,
|
2016-07-27 05:43:23 +02:00
|
|
|
dqcoeff, pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct16x16(src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_b(coeff, 256, x->skip_block, p->zbin, p->round,
|
2014-10-08 21:43:22 +02:00
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2016-07-27 05:43:23 +02:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct8x8(src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round,
|
2014-10-08 21:43:22 +02:00
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2016-07-27 05:43:23 +02:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
|
|
|
x->fwd_txm4x4(src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_b(coeff, 16, x->skip_block, p->zbin, p->round,
|
2014-10-08 21:43:22 +02:00
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2016-07-27 05:43:23 +02:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
2016-07-27 05:43:23 +02:00
|
|
|
default: assert(0);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
|
2013-07-11 22:01:44 +02:00
|
|
|
switch (tx_size) {
|
2013-04-30 20:29:27 +02:00
|
|
|
case TX_32X32:
|
2014-02-17 12:34:02 +01:00
|
|
|
fdct32x32(x->use_lp32x32fdct, src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_quantize_b_32x32(coeff, 1024, x->skip_block, p->zbin, p->round,
|
2013-07-11 22:01:44 +02:00
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2014-12-22 18:35:29 +01:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order->iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_fdct16x16(src_diff, coeff, diff_stride);
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_quantize_b(coeff, 256, x->skip_block, p->zbin, p->round, p->quant,
|
|
|
|
p->quant_shift, qcoeff, dqcoeff, pd->dequant, eob,
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order->scan, scan_order->iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_fdct8x8(src_diff, coeff, diff_stride);
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round, p->quant,
|
|
|
|
p->quant_shift, qcoeff, dqcoeff, pd->dequant, eob,
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order->scan, scan_order->iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
2013-11-22 20:45:30 +01:00
|
|
|
x->fwd_txm4x4(src_diff, coeff, diff_stride);
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_quantize_b(coeff, 16, x->skip_block, p->zbin, p->round, p->quant,
|
|
|
|
p->quant_shift, qcoeff, dqcoeff, pd->dequant, eob,
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order->scan, scan_order->iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
2016-07-27 05:43:23 +02:00
|
|
|
default: assert(0); break;
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2013-05-03 02:05:14 +02:00
|
|
|
}
|
|
|
|
|
2016-07-01 21:20:45 +02:00
|
|
|
static void encode_block(int plane, int block, int row, int col,
|
2016-07-27 05:43:23 +02:00
|
|
|
BLOCK_SIZE plane_bsize, 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-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];
|
2014-09-03 01:34:09 +02:00
|
|
|
tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2013-11-14 04:33:12 +01:00
|
|
|
uint8_t *dst;
|
2014-03-06 21:47:55 +01:00
|
|
|
ENTROPY_CONTEXT *a, *l;
|
2016-07-01 21:20:45 +02:00
|
|
|
dst = &pd->dst.buf[4 * row * pd->dst.stride + 4 * col];
|
2016-07-06 22:56:02 +02:00
|
|
|
a = &args->ta[col];
|
|
|
|
l = &args->tl[row];
|
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;
|
2014-03-06 21:47:55 +01:00
|
|
|
*a = *l = 0;
|
2013-09-21 01:29:24 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-08-07 01:11:22 +02:00
|
|
|
if (!x->skip_recode) {
|
Rework forward txfm/quantization skip system in RTC coding mode
This commit allows more aggressive decision to skip forward
transform and quantization for luma component in RTC coding mode.
The chroma components remains going through the normal coding
routine, since they are not included in the non-RD mode search
process.
It reduces the runtime cost by 2% - 10%. In speed -6,
vidyo1 1000 kbps
16576 b/f, 40.281 dB, 8402 ms -> 16576 b/f, 40.323 dB, 7764 ms
nik720p 1000 kbps
33337 b/f, 38.622 dB, 7473 ms -> 33299 b/f, 38.660 dB, 7314 ms
dark720p 1000 kbps
33330 b/f, 39.785 dB, 13505 ms -> 33325 b/f, 39.714 dB, 13105 ms
The compression performance of speed -6 is improved by 0.44% in
PSNR and 1.31% in SSIM.
Change-Id: Iae9e3738de6255babea734e5897f29118bebc6d7
2014-11-21 21:18:53 +01:00
|
|
|
if (x->quant_fp) {
|
|
|
|
// Encoding process for rtc mode
|
2015-07-30 20:52:28 +02:00
|
|
|
if (x->skip_txfm[0] == SKIP_TXFM_AC_DC && plane == 0) {
|
2014-08-28 18:09:37 +02:00
|
|
|
// skip forward transform
|
|
|
|
p->eobs[block] = 0;
|
|
|
|
*a = *l = 0;
|
|
|
|
return;
|
Rework forward txfm/quantization skip system in RTC coding mode
This commit allows more aggressive decision to skip forward
transform and quantization for luma component in RTC coding mode.
The chroma components remains going through the normal coding
routine, since they are not included in the non-RD mode search
process.
It reduces the runtime cost by 2% - 10%. In speed -6,
vidyo1 1000 kbps
16576 b/f, 40.281 dB, 8402 ms -> 16576 b/f, 40.323 dB, 7764 ms
nik720p 1000 kbps
33337 b/f, 38.622 dB, 7473 ms -> 33299 b/f, 38.660 dB, 7314 ms
dark720p 1000 kbps
33330 b/f, 39.785 dB, 13505 ms -> 33325 b/f, 39.714 dB, 13105 ms
The compression performance of speed -6 is improved by 0.44% in
PSNR and 1.31% in SSIM.
Change-Id: Iae9e3738de6255babea734e5897f29118bebc6d7
2014-11-21 21:18:53 +01:00
|
|
|
} else {
|
2016-07-01 21:20:45 +02:00
|
|
|
vp9_xform_quant_fp(x, plane, block, row, col, plane_bsize, tx_size);
|
2014-08-28 18:09:37 +02:00
|
|
|
}
|
2014-08-07 01:11:22 +02:00
|
|
|
} else {
|
Rework forward txfm/quantization skip system in RTC coding mode
This commit allows more aggressive decision to skip forward
transform and quantization for luma component in RTC coding mode.
The chroma components remains going through the normal coding
routine, since they are not included in the non-RD mode search
process.
It reduces the runtime cost by 2% - 10%. In speed -6,
vidyo1 1000 kbps
16576 b/f, 40.281 dB, 8402 ms -> 16576 b/f, 40.323 dB, 7764 ms
nik720p 1000 kbps
33337 b/f, 38.622 dB, 7473 ms -> 33299 b/f, 38.660 dB, 7314 ms
dark720p 1000 kbps
33330 b/f, 39.785 dB, 13505 ms -> 33325 b/f, 39.714 dB, 13105 ms
The compression performance of speed -6 is improved by 0.44% in
PSNR and 1.31% in SSIM.
Change-Id: Iae9e3738de6255babea734e5897f29118bebc6d7
2014-11-21 21:18:53 +01:00
|
|
|
if (max_txsize_lookup[plane_bsize] == tx_size) {
|
|
|
|
int txfm_blk_index = (plane << 2) + (block >> (tx_size << 1));
|
2015-07-30 20:52:28 +02:00
|
|
|
if (x->skip_txfm[txfm_blk_index] == SKIP_TXFM_NONE) {
|
Rework forward txfm/quantization skip system in RTC coding mode
This commit allows more aggressive decision to skip forward
transform and quantization for luma component in RTC coding mode.
The chroma components remains going through the normal coding
routine, since they are not included in the non-RD mode search
process.
It reduces the runtime cost by 2% - 10%. In speed -6,
vidyo1 1000 kbps
16576 b/f, 40.281 dB, 8402 ms -> 16576 b/f, 40.323 dB, 7764 ms
nik720p 1000 kbps
33337 b/f, 38.622 dB, 7473 ms -> 33299 b/f, 38.660 dB, 7314 ms
dark720p 1000 kbps
33330 b/f, 39.785 dB, 13505 ms -> 33325 b/f, 39.714 dB, 13105 ms
The compression performance of speed -6 is improved by 0.44% in
PSNR and 1.31% in SSIM.
Change-Id: Iae9e3738de6255babea734e5897f29118bebc6d7
2014-11-21 21:18:53 +01:00
|
|
|
// full forward transform and quantization
|
2016-07-01 21:20:45 +02:00
|
|
|
vp9_xform_quant(x, plane, block, row, col, plane_bsize, tx_size);
|
2015-07-30 20:52:28 +02:00
|
|
|
} else if (x->skip_txfm[txfm_blk_index] == SKIP_TXFM_AC_ONLY) {
|
Rework forward txfm/quantization skip system in RTC coding mode
This commit allows more aggressive decision to skip forward
transform and quantization for luma component in RTC coding mode.
The chroma components remains going through the normal coding
routine, since they are not included in the non-RD mode search
process.
It reduces the runtime cost by 2% - 10%. In speed -6,
vidyo1 1000 kbps
16576 b/f, 40.281 dB, 8402 ms -> 16576 b/f, 40.323 dB, 7764 ms
nik720p 1000 kbps
33337 b/f, 38.622 dB, 7473 ms -> 33299 b/f, 38.660 dB, 7314 ms
dark720p 1000 kbps
33330 b/f, 39.785 dB, 13505 ms -> 33325 b/f, 39.714 dB, 13105 ms
The compression performance of speed -6 is improved by 0.44% in
PSNR and 1.31% in SSIM.
Change-Id: Iae9e3738de6255babea734e5897f29118bebc6d7
2014-11-21 21:18:53 +01:00
|
|
|
// fast path forward transform and quantization
|
2016-07-01 21:20:45 +02:00
|
|
|
vp9_xform_quant_dc(x, plane, block, row, col, plane_bsize, tx_size);
|
Rework forward txfm/quantization skip system in RTC coding mode
This commit allows more aggressive decision to skip forward
transform and quantization for luma component in RTC coding mode.
The chroma components remains going through the normal coding
routine, since they are not included in the non-RD mode search
process.
It reduces the runtime cost by 2% - 10%. In speed -6,
vidyo1 1000 kbps
16576 b/f, 40.281 dB, 8402 ms -> 16576 b/f, 40.323 dB, 7764 ms
nik720p 1000 kbps
33337 b/f, 38.622 dB, 7473 ms -> 33299 b/f, 38.660 dB, 7314 ms
dark720p 1000 kbps
33330 b/f, 39.785 dB, 13505 ms -> 33325 b/f, 39.714 dB, 13105 ms
The compression performance of speed -6 is improved by 0.44% in
PSNR and 1.31% in SSIM.
Change-Id: Iae9e3738de6255babea734e5897f29118bebc6d7
2014-11-21 21:18:53 +01:00
|
|
|
} else {
|
|
|
|
// skip forward transform
|
|
|
|
p->eobs[block] = 0;
|
|
|
|
*a = *l = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else {
|
2016-07-01 21:20:45 +02:00
|
|
|
vp9_xform_quant(x, plane, block, row, col, plane_bsize, tx_size);
|
Rework forward txfm/quantization skip system in RTC coding mode
This commit allows more aggressive decision to skip forward
transform and quantization for luma component in RTC coding mode.
The chroma components remains going through the normal coding
routine, since they are not included in the non-RD mode search
process.
It reduces the runtime cost by 2% - 10%. In speed -6,
vidyo1 1000 kbps
16576 b/f, 40.281 dB, 8402 ms -> 16576 b/f, 40.323 dB, 7764 ms
nik720p 1000 kbps
33337 b/f, 38.622 dB, 7473 ms -> 33299 b/f, 38.660 dB, 7314 ms
dark720p 1000 kbps
33330 b/f, 39.785 dB, 13505 ms -> 33325 b/f, 39.714 dB, 13105 ms
The compression performance of speed -6 is improved by 0.44% in
PSNR and 1.31% in SSIM.
Change-Id: Iae9e3738de6255babea734e5897f29118bebc6d7
2014-11-21 21:18:53 +01:00
|
|
|
}
|
2014-07-02 01:10:44 +02:00
|
|
|
}
|
2014-05-30 03:14:17 +02:00
|
|
|
}
|
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-04-10 20:19:38 +02:00
|
|
|
const int ctx = combine_entropy_contexts(*a, *l);
|
2016-07-06 19:05:51 +02:00
|
|
|
*a = *l = vp9_optimize_b(x, plane, block, tx_size, ctx) > 0;
|
2013-11-06 06:07:08 +01:00
|
|
|
} else {
|
2014-03-06 21:47:55 +01:00
|
|
|
*a = *l = p->eobs[block] > 0;
|
2013-11-06 06:07:08 +01:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2016-07-27 05:43:23 +02:00
|
|
|
if (p->eobs[block]) *(args->skip) = 0;
|
2014-01-15 02:58:25 +01:00
|
|
|
|
2016-07-27 05:43:23 +02:00
|
|
|
if (x->skip_encode || p->eobs[block] == 0) return;
|
2014-09-24 15:36:34 +02:00
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
|
|
|
|
switch (tx_size) {
|
|
|
|
case TX_32X32:
|
2016-07-27 05:43:23 +02:00
|
|
|
vp9_highbd_idct32x32_add(dqcoeff, dst, pd->dst.stride, p->eobs[block],
|
|
|
|
xd->bd);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2016-07-27 05:43:23 +02:00
|
|
|
vp9_highbd_idct16x16_add(dqcoeff, dst, pd->dst.stride, p->eobs[block],
|
|
|
|
xd->bd);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2016-07-27 05:43:23 +02:00
|
|
|
vp9_highbd_idct8x8_add(dqcoeff, dst, pd->dst.stride, p->eobs[block],
|
|
|
|
xd->bd);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
|
|
|
// 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.
|
2016-07-27 05:43:23 +02:00
|
|
|
x->highbd_itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block],
|
|
|
|
xd->bd);
|
2014-09-24 15:36:34 +02:00
|
|
|
break;
|
2016-07-27 05:43:23 +02:00
|
|
|
default: assert(0 && "Invalid transform size");
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
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.
|
2014-05-21 20:09:44 +02:00
|
|
|
x->itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
2016-07-27 05:43:23 +02:00
|
|
|
default: assert(0 && "Invalid transform size"); break;
|
2013-04-30 20:29:27 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2014-03-15 01:05:35 +01:00
|
|
|
|
2016-07-01 21:20:45 +02:00
|
|
|
static void encode_block_pass1(int plane, int block, int row, int col,
|
2016-07-27 05:43:23 +02:00
|
|
|
BLOCK_SIZE plane_bsize, TX_SIZE tx_size,
|
|
|
|
void *arg) {
|
2014-02-26 22:51:12 +01:00
|
|
|
MACROBLOCK *const x = (MACROBLOCK *)arg;
|
2013-10-23 20:09:27 +02:00
|
|
|
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];
|
2014-09-03 01:34:09 +02:00
|
|
|
tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2013-11-14 22:45:51 +01:00
|
|
|
uint8_t *dst;
|
2016-07-01 21:20:45 +02:00
|
|
|
dst = &pd->dst.buf[4 * row * pd->dst.stride + 4 * col];
|
2013-10-23 20:09:27 +02:00
|
|
|
|
2016-07-01 21:20:45 +02:00
|
|
|
vp9_xform_quant(x, plane, block, row, col, plane_bsize, tx_size);
|
2013-10-23 20:09:27 +02:00
|
|
|
|
2014-09-24 15:36:34 +02:00
|
|
|
if (p->eobs[block] > 0) {
|
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
|
2016-07-27 05:43:23 +02:00
|
|
|
x->highbd_itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block], xd->bd);
|
|
|
|
return;
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
2014-05-21 20:09:44 +02:00
|
|
|
x->itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
2013-10-23 20:09:27 +02:00
|
|
|
}
|
|
|
|
|
2014-02-26 22:51:12 +01:00
|
|
|
void vp9_encode_sby_pass1(MACROBLOCK *x, BLOCK_SIZE bsize) {
|
2014-02-17 13:57:40 +01:00
|
|
|
vp9_subtract_plane(x, bsize, 0);
|
2014-02-26 22:51:12 +01:00
|
|
|
vp9_foreach_transformed_block_in_plane(&x->e_mbd, bsize, 0,
|
|
|
|
encode_block_pass1, x);
|
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;
|
2016-01-20 01:40:20 +01:00
|
|
|
MODE_INFO *mi = xd->mi[0];
|
2016-07-27 05:43:23 +02:00
|
|
|
struct encode_b_args arg = { x, 1, NULL, NULL, &mi->skip };
|
2014-02-17 13:57:40 +01:00
|
|
|
int plane;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2016-01-20 01:40:20 +01:00
|
|
|
mi->skip = 1;
|
2014-09-13 00:58:17 +02:00
|
|
|
|
2016-07-27 05:43:23 +02:00
|
|
|
if (x->skip) return;
|
2014-09-13 00:58:17 +02:00
|
|
|
|
2014-02-17 13:57:40 +01:00
|
|
|
for (plane = 0; plane < MAX_MB_PLANE; ++plane) {
|
2016-07-27 05:43:23 +02:00
|
|
|
if (!x->skip_recode) vp9_subtract_plane(x, bsize, plane);
|
2013-07-24 00:53:09 +02:00
|
|
|
|
2014-02-27 23:54:20 +01:00
|
|
|
if (x->optimize && (!x->skip_recode || !x->skip_optimize)) {
|
2016-07-27 05:43:23 +02:00
|
|
|
const struct macroblockd_plane *const pd = &xd->plane[plane];
|
2016-01-20 01:40:20 +01:00
|
|
|
const TX_SIZE tx_size = plane ? get_uv_tx_size(mi, pd) : mi->tx_size;
|
2016-07-27 05:43:23 +02:00
|
|
|
vp9_get_entropy_contexts(bsize, tx_size, pd, ctx.ta[plane],
|
|
|
|
ctx.tl[plane]);
|
2016-07-06 22:56:02 +02:00
|
|
|
arg.enable_coeff_opt = 1;
|
|
|
|
} else {
|
|
|
|
arg.enable_coeff_opt = 0;
|
2014-02-27 23:54:20 +01:00
|
|
|
}
|
2016-07-06 22:56:02 +02:00
|
|
|
arg.ta = ctx.ta[plane];
|
|
|
|
arg.tl = ctx.tl[plane];
|
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
|
|
|
|
2016-07-01 21:20:45 +02:00
|
|
|
void vp9_encode_block_intra(int plane, int block, int row, int col,
|
2016-07-27 05:43:23 +02:00
|
|
|
BLOCK_SIZE plane_bsize, TX_SIZE tx_size,
|
|
|
|
void *arg) {
|
|
|
|
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;
|
2016-01-20 01:40:20 +01:00
|
|
|
MODE_INFO *mi = xd->mi[0];
|
2013-05-31 21:30:32 +02:00
|
|
|
struct macroblock_plane *const p = &x->plane[plane];
|
|
|
|
struct macroblockd_plane *const pd = &xd->plane[plane];
|
2014-09-03 01:34:09 +02:00
|
|
|
tran_low_t *coeff = BLOCK_OFFSET(p->coeff, block);
|
|
|
|
tran_low_t *qcoeff = BLOCK_OFFSET(p->qcoeff, block);
|
|
|
|
tran_low_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
|
2013-12-13 20:05:26 +01:00
|
|
|
const scan_order *scan_order;
|
2015-07-17 02:37:16 +02:00
|
|
|
TX_TYPE tx_type = DCT_DCT;
|
2014-04-12 00:26:24 +02:00
|
|
|
PREDICTION_MODE mode;
|
2014-10-07 21:30:33 +02:00
|
|
|
const int bwl = b_width_log2_lookup[plane_bsize];
|
2013-11-20 22:58:21 +01:00
|
|
|
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;
|
2016-04-25 21:40:56 +02:00
|
|
|
ENTROPY_CONTEXT *a = NULL;
|
|
|
|
ENTROPY_CONTEXT *l = NULL;
|
|
|
|
int entropy_ctx = 0;
|
2016-07-01 21:20:45 +02:00
|
|
|
dst = &pd->dst.buf[4 * (row * dst_stride + col)];
|
|
|
|
src = &p->src.buf[4 * (row * src_stride + col)];
|
|
|
|
src_diff = &p->src_diff[4 * (row * diff_stride + col)];
|
2016-07-06 22:56:02 +02:00
|
|
|
if (args->enable_coeff_opt) {
|
|
|
|
a = &args->ta[col];
|
|
|
|
l = &args->tl[row];
|
2016-04-25 21:40:56 +02:00
|
|
|
entropy_ctx = combine_entropy_contexts(*a, *l);
|
|
|
|
}
|
2013-05-16 02:21:15 +02:00
|
|
|
|
2015-07-17 02:37:16 +02:00
|
|
|
if (tx_size == TX_4X4) {
|
2015-09-29 19:40:27 +02:00
|
|
|
tx_type = get_tx_type_4x4(get_plane_type(plane), xd, block);
|
2015-07-17 02:37:16 +02:00
|
|
|
scan_order = &vp9_scan_orders[TX_4X4][tx_type];
|
2016-01-20 01:40:20 +01:00
|
|
|
mode = plane == 0 ? get_y_mode(xd->mi[0], block) : mi->uv_mode;
|
2015-07-17 02:37:16 +02:00
|
|
|
} else {
|
2016-01-20 01:40:20 +01:00
|
|
|
mode = plane == 0 ? mi->mode : mi->uv_mode;
|
2015-07-17 02:37:16 +02:00
|
|
|
if (tx_size == TX_32X32) {
|
|
|
|
scan_order = &vp9_default_scan_orders[TX_32X32];
|
|
|
|
} else {
|
2015-09-29 19:40:27 +02:00
|
|
|
tx_type = get_tx_type(get_plane_type(plane), xd);
|
2015-07-17 02:37:16 +02:00
|
|
|
scan_order = &vp9_scan_orders[tx_size][tx_type];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
vp9_predict_intra_block(xd, bwl, tx_size, mode, x->skip_encode ? src : dst,
|
2016-07-27 05:43:23 +02:00
|
|
|
x->skip_encode ? src_stride : dst_stride, dst,
|
|
|
|
dst_stride, col, row, plane);
|
2015-07-17 02:37:16 +02:00
|
|
|
|
2014-09-24 15:36:34 +02:00
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
|
|
|
|
switch (tx_size) {
|
|
|
|
case TX_32X32:
|
|
|
|
if (!x->skip_recode) {
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_highbd_subtract_block(32, 32, src_diff, diff_stride, src,
|
|
|
|
src_stride, dst, dst_stride, xd->bd);
|
2014-10-08 21:43:22 +02:00
|
|
|
highbd_fdct32x32(x->use_lp32x32fdct, src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_b_32x32(coeff, 1024, x->skip_block, p->zbin,
|
2014-10-08 21:43:22 +02:00
|
|
|
p->round, p->quant, p->quant_shift,
|
2014-12-22 18:35:29 +01:00
|
|
|
qcoeff, dqcoeff, pd->dequant, eob,
|
2014-10-08 21:43:22 +02:00
|
|
|
scan_order->scan, scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
if (!x->skip_encode && *eob) {
|
2014-10-08 21:43:22 +02:00
|
|
|
vp9_highbd_idct32x32_add(dqcoeff, dst, dst_stride, *eob, xd->bd);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TX_16X16:
|
|
|
|
if (!x->skip_recode) {
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_highbd_subtract_block(16, 16, src_diff, diff_stride, src,
|
|
|
|
src_stride, dst, dst_stride, xd->bd);
|
2015-07-20 19:26:04 +02:00
|
|
|
if (tx_type == DCT_DCT)
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct16x16(src_diff, coeff, diff_stride);
|
2015-07-20 19:26:04 +02:00
|
|
|
else
|
|
|
|
vp9_highbd_fht16x16(src_diff, coeff, diff_stride, tx_type);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_b(coeff, 256, x->skip_block, p->zbin, p->round,
|
2014-10-08 21:43:22 +02:00
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2016-07-27 05:43:23 +02:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
if (!x->skip_encode && *eob) {
|
2016-07-27 05:43:23 +02:00
|
|
|
vp9_highbd_iht16x16_add(tx_type, dqcoeff, dst, dst_stride, *eob,
|
|
|
|
xd->bd);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TX_8X8:
|
|
|
|
if (!x->skip_recode) {
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_highbd_subtract_block(8, 8, src_diff, diff_stride, src,
|
|
|
|
src_stride, dst, dst_stride, xd->bd);
|
2015-07-20 19:26:04 +02:00
|
|
|
if (tx_type == DCT_DCT)
|
2015-07-29 00:57:40 +02:00
|
|
|
vpx_highbd_fdct8x8(src_diff, coeff, diff_stride);
|
2015-07-20 19:26:04 +02:00
|
|
|
else
|
|
|
|
vp9_highbd_fht8x8(src_diff, coeff, diff_stride, tx_type);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round,
|
2014-10-08 21:43:22 +02:00
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2016-07-27 05:43:23 +02:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
if (!x->skip_encode && *eob) {
|
2014-10-08 21:43:22 +02:00
|
|
|
vp9_highbd_iht8x8_add(tx_type, dqcoeff, dst, dst_stride, *eob,
|
|
|
|
xd->bd);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TX_4X4:
|
|
|
|
if (!x->skip_recode) {
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_highbd_subtract_block(4, 4, src_diff, diff_stride, src,
|
|
|
|
src_stride, dst, dst_stride, xd->bd);
|
2014-09-24 15:36:34 +02:00
|
|
|
if (tx_type != DCT_DCT)
|
2014-10-08 21:43:22 +02:00
|
|
|
vp9_highbd_fht4x4(src_diff, coeff, diff_stride, tx_type);
|
2014-09-24 15:36:34 +02:00
|
|
|
else
|
|
|
|
x->fwd_txm4x4(src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_highbd_quantize_b(coeff, 16, x->skip_block, p->zbin, p->round,
|
2014-10-08 21:43:22 +02:00
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2016-07-27 05:43:23 +02:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
|
|
|
scan_order->iscan);
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!x->skip_encode && *eob) {
|
2014-10-08 21:43:22 +02:00
|
|
|
if (tx_type == DCT_DCT) {
|
2014-09-24 15:36:34 +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.
|
2014-10-08 21:43:22 +02:00
|
|
|
x->highbd_itxm_add(dqcoeff, dst, dst_stride, *eob, xd->bd);
|
|
|
|
} else {
|
|
|
|
vp9_highbd_iht4x4_16_add(dqcoeff, dst, dst_stride, tx_type, xd->bd);
|
|
|
|
}
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
|
|
|
break;
|
2016-07-27 05:43:23 +02:00
|
|
|
default: assert(0); return;
|
2014-09-24 15:36:34 +02:00
|
|
|
}
|
2016-07-27 05:43:23 +02:00
|
|
|
if (*eob) *(args->skip) = 0;
|
2014-09-24 15:36:34 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
|
|
|
|
2013-07-11 20:35:13 +02:00
|
|
|
switch (tx_size) {
|
2013-05-16 02:21:15 +02:00
|
|
|
case TX_32X32:
|
2013-11-07 23:56:58 +01:00
|
|
|
if (!x->skip_recode) {
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_subtract_block(32, 32, src_diff, diff_stride, src, src_stride, dst,
|
|
|
|
dst_stride);
|
2014-02-17 12:34:02 +01:00
|
|
|
fdct32x32(x->use_lp32x32fdct, src_diff, coeff, diff_stride);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_quantize_b_32x32(coeff, 1024, x->skip_block, p->zbin, p->round,
|
2013-11-07 23:56:58 +01:00
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
2014-12-22 18:35:29 +01:00
|
|
|
pd->dequant, eob, scan_order->scan,
|
2013-12-13 20:05:26 +01:00
|
|
|
scan_order->iscan);
|
2013-11-07 23:56:58 +01:00
|
|
|
}
|
2016-07-06 22:56:02 +02:00
|
|
|
if (args->enable_coeff_opt && !x->skip_recode) {
|
2016-07-27 05:43:23 +02:00
|
|
|
*a = *l = vp9_optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
|
2016-04-25 21:40:56 +02: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-11-07 23:56:58 +01:00
|
|
|
if (!x->skip_recode) {
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_subtract_block(16, 16, src_diff, diff_stride, src, src_stride, dst,
|
|
|
|
dst_stride);
|
2014-02-06 20:54:15 +01:00
|
|
|
vp9_fht16x16(src_diff, coeff, diff_stride, tx_type);
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_quantize_b(coeff, 256, x->skip_block, p->zbin, p->round, p->quant,
|
|
|
|
p->quant_shift, qcoeff, dqcoeff, pd->dequant, eob,
|
|
|
|
scan_order->scan, scan_order->iscan);
|
2013-11-07 23:56:58 +01:00
|
|
|
}
|
2016-07-06 22:56:02 +02:00
|
|
|
if (args->enable_coeff_opt && !x->skip_recode) {
|
2016-07-06 19:05:51 +02:00
|
|
|
*a = *l = vp9_optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
|
2016-04-25 21:40:56 +02: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-11-07 23:56:58 +01:00
|
|
|
if (!x->skip_recode) {
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_subtract_block(8, 8, src_diff, diff_stride, src, src_stride, dst,
|
|
|
|
dst_stride);
|
2014-02-06 20:54:15 +01:00
|
|
|
vp9_fht8x8(src_diff, coeff, diff_stride, tx_type);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round, p->quant,
|
2016-07-27 05:43:23 +02:00
|
|
|
p->quant_shift, qcoeff, dqcoeff, pd->dequant, eob,
|
|
|
|
scan_order->scan, scan_order->iscan);
|
2013-11-07 23:56:58 +01:00
|
|
|
}
|
2016-07-06 22:56:02 +02:00
|
|
|
if (args->enable_coeff_opt && !x->skip_recode) {
|
2016-07-06 19:05:51 +02:00
|
|
|
*a = *l = vp9_optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
|
2016-04-25 21:40:56 +02: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-11-07 23:56:58 +01:00
|
|
|
if (!x->skip_recode) {
|
2016-07-27 05:43:23 +02:00
|
|
|
vpx_subtract_block(4, 4, src_diff, diff_stride, 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);
|
2015-08-04 18:24:52 +02:00
|
|
|
vpx_quantize_b(coeff, 16, x->skip_block, p->zbin, p->round, p->quant,
|
2016-07-27 05:43:23 +02:00
|
|
|
p->quant_shift, qcoeff, dqcoeff, pd->dequant, eob,
|
|
|
|
scan_order->scan, scan_order->iscan);
|
2013-11-07 23:56:58 +01:00
|
|
|
}
|
2016-07-06 22:56:02 +02:00
|
|
|
if (args->enable_coeff_opt && !x->skip_recode) {
|
2016-07-06 19:05:51 +02:00
|
|
|
*a = *l = vp9_optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
|
2016-04-25 21:40:56 +02: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-05-21 20:09:44 +02:00
|
|
|
x->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;
|
2016-07-27 05:43:23 +02:00
|
|
|
default: assert(0); break;
|
2013-05-16 02:21:15 +02:00
|
|
|
}
|
2016-07-27 05:43:23 +02:00
|
|
|
if (*eob) *(args->skip) = 0;
|
2013-05-16 02:21:15 +02:00
|
|
|
}
|
|
|
|
|
2016-04-25 21:40:56 +02:00
|
|
|
void vp9_encode_intra_block_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane,
|
|
|
|
int enable_optimize_b) {
|
2014-02-09 04:30:45 +01:00
|
|
|
const MACROBLOCKD *const xd = &x->e_mbd;
|
2016-04-25 21:40:56 +02:00
|
|
|
struct optimize_ctx ctx;
|
2016-07-27 05:43:23 +02:00
|
|
|
struct encode_b_args arg = { x, enable_optimize_b, ctx.ta[plane],
|
|
|
|
ctx.tl[plane], &xd->mi[0]->skip };
|
2013-05-16 02:21:15 +02:00
|
|
|
|
2016-04-25 21:40:56 +02:00
|
|
|
if (enable_optimize_b && x->optimize &&
|
|
|
|
(!x->skip_recode || !x->skip_optimize)) {
|
2016-07-27 05:43:23 +02:00
|
|
|
const struct macroblockd_plane *const pd = &xd->plane[plane];
|
|
|
|
const TX_SIZE tx_size =
|
|
|
|
plane ? get_uv_tx_size(xd->mi[0], pd) : xd->mi[0]->tx_size;
|
2016-04-25 21:40:56 +02:00
|
|
|
vp9_get_entropy_contexts(bsize, tx_size, pd, ctx.ta[plane], ctx.tl[plane]);
|
2016-07-06 22:56:02 +02:00
|
|
|
} else {
|
|
|
|
arg.enable_coeff_opt = 0;
|
2016-04-25 21:40:56 +02:00
|
|
|
}
|
|
|
|
|
2014-10-22 22:01:40 +02:00
|
|
|
vp9_foreach_transformed_block_in_plane(xd, bsize, plane,
|
|
|
|
vp9_encode_block_intra, &arg);
|
2013-05-16 02:21:15 +02:00
|
|
|
}
|