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
|
|
|
*/
|
|
|
|
|
2012-12-23 16:20:10 +01:00
|
|
|
#include "./vpx_config.h"
|
2012-11-28 19:41:40 +01:00
|
|
|
#include "vp9/encoder/vp9_encodemb.h"
|
2012-11-27 22:59:17 +01:00
|
|
|
#include "vp9/common/vp9_reconinter.h"
|
2012-11-28 19:41:40 +01:00
|
|
|
#include "vp9/encoder/vp9_quantize.h"
|
|
|
|
#include "vp9/encoder/vp9_tokenize.h"
|
2012-11-27 22:59:17 +01:00
|
|
|
#include "vp9/common/vp9_reconintra.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "vpx_mem/vpx_mem.h"
|
2012-11-28 19:41:40 +01:00
|
|
|
#include "vp9/encoder/vp9_rdopt.h"
|
2012-11-27 22:59:17 +01:00
|
|
|
#include "vp9/common/vp9_systemdependent.h"
|
2012-11-09 02:09:30 +01:00
|
|
|
#include "vp9_rtcd.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-05-23 12:08:00 +02:00
|
|
|
DECLARE_ALIGNED(16, extern const uint8_t,
|
|
|
|
vp9_pt_energy_class[MAX_ENTROPY_TOKENS]);
|
|
|
|
|
2013-06-21 18:35:37 +02:00
|
|
|
void vp9_subtract_block_c(int rows, int cols,
|
|
|
|
int16_t *diff_ptr, ptrdiff_t diff_stride,
|
|
|
|
const uint8_t *src_ptr, ptrdiff_t src_stride,
|
|
|
|
const uint8_t *pred_ptr, 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++)
|
2012-07-14 00:21:29 +02:00
|
|
|
diff_ptr[c] = src_ptr[c] - pred_ptr[c];
|
|
|
|
|
2013-04-23 17:26:10 +02:00
|
|
|
diff_ptr += diff_stride;
|
|
|
|
pred_ptr += pred_stride;
|
2012-07-14 00:21:29 +02:00
|
|
|
src_ptr += src_stride;
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2013-06-18 01:09:03 +02:00
|
|
|
static void inverse_transform_b_4x4_add(MACROBLOCKD *xd, int eob,
|
|
|
|
int16_t *dqcoeff, uint8_t *dest,
|
|
|
|
int stride) {
|
|
|
|
if (eob <= 1)
|
|
|
|
xd->inv_txm4x4_1_add(dqcoeff, dest, stride);
|
|
|
|
else
|
|
|
|
xd->inv_txm4x4_add(dqcoeff, dest, stride);
|
|
|
|
}
|
|
|
|
|
2012-10-13 17:15:51 +02:00
|
|
|
|
2013-04-23 17:26:10 +02:00
|
|
|
static void subtract_plane(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize, int plane) {
|
2013-05-31 21:30:32 +02:00
|
|
|
struct macroblock_plane *const p = &x->plane[plane];
|
|
|
|
const MACROBLOCKD *const xd = &x->e_mbd;
|
|
|
|
const struct macroblockd_plane *const pd = &xd->plane[plane];
|
|
|
|
const int bw = plane_block_width(bsize, pd);
|
|
|
|
const int bh = plane_block_height(bsize, pd);
|
|
|
|
|
|
|
|
vp9_subtract_block(bh, bw, p->src_diff, bw,
|
|
|
|
p->src.buf, p->src.stride,
|
|
|
|
pd->dst.buf, pd->dst.stride);
|
2011-08-05 01:30:27 +02:00
|
|
|
}
|
|
|
|
|
2013-04-23 17:26:10 +02:00
|
|
|
void vp9_subtract_sby(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
|
|
|
|
subtract_plane(x, bsize, 0);
|
32x32 transform for superblocks.
This adds Debargha's DCT/DWT hybrid and a regular 32x32 DCT, and adds
code all over the place to wrap that in the bitstream/encoder/decoder/RD.
Some implementation notes (these probably need careful review):
- token range is extended by 1 bit, since the value range out of this
transform is [-16384,16383].
- the coefficients coming out of the FDCT are manually scaled back by
1 bit, or else they won't fit in int16_t (they are 17 bits). Because
of this, the RD error scoring does not right-shift the MSE score by
two (unlike for 4x4/8x8/16x16).
- to compensate for this loss in precision, the quantizer is halved
also. This is currently a little hacky.
- FDCT and IDCT is double-only right now. Needs a fixed-point impl.
- There are no default probabilities for the 32x32 transform yet; I'm
simply using the 16x16 luma ones. A future commit will add newly
generated probabilities for all transforms.
- No ADST version. I don't think we'll add one for this level; if an
ADST is desired, transform-size selection can scale back to 16x16
or lower, and use an ADST at that level.
Additional notes specific to Debargha's DWT/DCT hybrid:
- coefficient scale is different for the top/left 16x16 (DCT-over-DWT)
block than for the rest (DWT pixel differences) of the block. Therefore,
RD error scoring isn't easily scalable between coefficient and pixel
domain. Thus, unfortunately, we need to compute the RD distortion in
the pixel domain until we figure out how to scale these appropriately.
Change-Id: I00386f20f35d7fabb19aba94c8162f8aee64ef2b
2012-12-07 23:45:05 +01:00
|
|
|
}
|
|
|
|
|
2013-04-23 17:26:10 +02:00
|
|
|
void vp9_subtract_sbuv(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
|
|
|
|
int i;
|
32x32 transform for superblocks.
This adds Debargha's DCT/DWT hybrid and a regular 32x32 DCT, and adds
code all over the place to wrap that in the bitstream/encoder/decoder/RD.
Some implementation notes (these probably need careful review):
- token range is extended by 1 bit, since the value range out of this
transform is [-16384,16383].
- the coefficients coming out of the FDCT are manually scaled back by
1 bit, or else they won't fit in int16_t (they are 17 bits). Because
of this, the RD error scoring does not right-shift the MSE score by
two (unlike for 4x4/8x8/16x16).
- to compensate for this loss in precision, the quantizer is halved
also. This is currently a little hacky.
- FDCT and IDCT is double-only right now. Needs a fixed-point impl.
- There are no default probabilities for the 32x32 transform yet; I'm
simply using the 16x16 luma ones. A future commit will add newly
generated probabilities for all transforms.
- No ADST version. I don't think we'll add one for this level; if an
ADST is desired, transform-size selection can scale back to 16x16
or lower, and use an ADST at that level.
Additional notes specific to Debargha's DWT/DCT hybrid:
- coefficient scale is different for the top/left 16x16 (DCT-over-DWT)
block than for the rest (DWT pixel differences) of the block. Therefore,
RD error scoring isn't easily scalable between coefficient and pixel
domain. Thus, unfortunately, we need to compute the RD distortion in
the pixel domain until we figure out how to scale these appropriately.
Change-Id: I00386f20f35d7fabb19aba94c8162f8aee64ef2b
2012-12-07 23:45:05 +01:00
|
|
|
|
2013-04-23 17:26:10 +02:00
|
|
|
for (i = 1; i < MAX_MB_PLANE; i++)
|
|
|
|
subtract_plane(x, bsize, i);
|
2013-03-04 23:12:17 +01:00
|
|
|
}
|
|
|
|
|
2013-04-23 17:26:10 +02:00
|
|
|
void vp9_subtract_sb(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
|
|
|
|
vp9_subtract_sby(x, bsize);
|
|
|
|
vp9_subtract_sbuv(x, bsize);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2013-04-23 17:26:10 +02:00
|
|
|
|
2011-02-14 23:18:18 +01: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;
|
|
|
|
};
|
|
|
|
|
2010-10-01 05:41:37 +02:00
|
|
|
// TODO: experiments to find optimal multiple numbers
|
2010-12-06 22:33:01 +01:00
|
|
|
#define Y1_RD_MULT 4
|
|
|
|
#define UV_RD_MULT 2
|
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
|
|
|
}
|
|
|
|
|
2013-04-30 18:54:51 +02:00
|
|
|
static void optimize_b(VP9_COMMON *const cm, MACROBLOCK *mb,
|
|
|
|
int plane, int block, BLOCK_SIZE_TYPE bsize,
|
2012-10-30 05:02:36 +01:00
|
|
|
ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l,
|
2013-04-30 18:54:51 +02:00
|
|
|
TX_SIZE tx_size) {
|
2013-06-06 22:44:34 +02:00
|
|
|
const int ref = mb->e_mbd.mode_info_context->mbmi.ref_frame[0] != INTRA_FRAME;
|
2013-02-27 19:00:24 +01:00
|
|
|
MACROBLOCKD *const xd = &mb->e_mbd;
|
2013-03-04 23:12:17 +01:00
|
|
|
vp9_token_state tokens[1025][2];
|
|
|
|
unsigned best_index[1025][2];
|
2013-04-30 18:54:51 +02:00
|
|
|
const int16_t *coeff_ptr = BLOCK_OFFSET(mb->plane[plane].coeff,
|
|
|
|
block, 16);
|
2013-04-02 23:50:40 +02:00
|
|
|
int16_t *qcoeff_ptr;
|
|
|
|
int16_t *dqcoeff_ptr;
|
2013-04-30 18:54:51 +02:00
|
|
|
int eob = xd->plane[plane].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-04-30 18:54:51 +02:00
|
|
|
PLANE_TYPE type = xd->plane[plane].plane_type;
|
2012-07-14 00:21:29 +02:00
|
|
|
int err_mult = plane_rd_mult[type];
|
2013-07-01 19:40:00 +02:00
|
|
|
int default_eob;
|
2013-07-01 20:36:07 +02:00
|
|
|
const int16_t *scan, *nb;
|
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-04-30 18:54:51 +02:00
|
|
|
const int ib = txfrm_block_to_raster_block(xd, bsize, plane,
|
|
|
|
block, 2 * tx_size);
|
|
|
|
const int16_t *dequant_ptr = xd->plane[plane].dequant;
|
2013-05-09 19:47:58 +02:00
|
|
|
const uint8_t * band_translate;
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-04-30 18:54:51 +02:00
|
|
|
assert((!type && !plane) || (type && plane));
|
|
|
|
dqcoeff_ptr = BLOCK_OFFSET(xd->plane[plane].dqcoeff, block, 16);
|
|
|
|
qcoeff_ptr = BLOCK_OFFSET(xd->plane[plane].qcoeff, block, 16);
|
2012-10-16 01:41:41 +02:00
|
|
|
switch (tx_size) {
|
2012-08-11 00:34:31 +02:00
|
|
|
default:
|
2013-07-24 21:55:45 +02:00
|
|
|
case TX_4X4:
|
2012-08-11 00:34:31 +02:00
|
|
|
default_eob = 16;
|
2013-07-24 21:55:45 +02:00
|
|
|
scan = get_scan_4x4(get_tx_type_4x4(type, xd, ib));
|
2013-05-09 19:47:58 +02:00
|
|
|
band_translate = vp9_coefband_trans_4x4;
|
2012-08-11 00:34:31 +02:00
|
|
|
break;
|
2013-07-24 21:55:45 +02:00
|
|
|
case TX_8X8:
|
|
|
|
scan = get_scan_8x8(get_tx_type_8x8(type, xd));
|
2012-08-11 00:34:31 +02:00
|
|
|
default_eob = 64;
|
2013-05-09 19:47:58 +02:00
|
|
|
band_translate = vp9_coefband_trans_8x8plus;
|
2012-08-11 00:34:31 +02:00
|
|
|
break;
|
2013-07-24 21:55:45 +02:00
|
|
|
case TX_16X16:
|
|
|
|
scan = get_scan_16x16(get_tx_type_16x16(type, xd));
|
2012-12-03 23:53:45 +01:00
|
|
|
default_eob = 256;
|
2013-05-09 19:47:58 +02:00
|
|
|
band_translate = vp9_coefband_trans_8x8plus;
|
2012-12-03 23:53:45 +01:00
|
|
|
break;
|
2013-03-04 23:12:17 +01:00
|
|
|
case TX_32X32:
|
2013-05-22 15:09:55 +02:00
|
|
|
scan = vp9_default_scan_32x32;
|
2013-03-04 23:12:17 +01:00
|
|
|
default_eob = 1024;
|
2013-05-09 19:47:58 +02:00
|
|
|
band_translate = vp9_coefband_trans_8x8plus;
|
2013-03-04 23:12:17 +01:00
|
|
|
break;
|
2012-08-11 00:34:31 +02:00
|
|
|
}
|
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-06-06 22:44:34 +02:00
|
|
|
if (mb->e_mbd.mode_info_context->mbmi.ref_frame[0] == INTRA_FRAME)
|
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;
|
2012-07-14 00:21:29 +02:00
|
|
|
tokens[eob][0].token = DCT_EOB_TOKEN;
|
|
|
|
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[
|
|
|
|
qcoeff_ptr[scan[i]]].token];
|
2013-07-01 19:40:00 +02:00
|
|
|
nb = vp9_get_coef_neighbors_handle(scan);
|
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];
|
2012-07-14 00:21:29 +02:00
|
|
|
x = qcoeff_ptr[rc];
|
|
|
|
/* 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-05-09 19:47:58 +02:00
|
|
|
band = get_coef_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-06-28 05:57:37 +02:00
|
|
|
mb->token_costs[tx_size][type][ref][0][band][pt]
|
|
|
|
[tokens[next][0].token];
|
2012-07-14 00:21:29 +02:00
|
|
|
rate1 +=
|
2013-06-28 05:57:37 +02:00
|
|
|
mb->token_costs[tx_size][type][ref][0][band][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;
|
2012-10-31 01:12:12 +01:00
|
|
|
base_bits = *(vp9_dct_value_cost_ptr + x);
|
2013-03-04 23:12:17 +01:00
|
|
|
dx = mul * (dqcoeff_ptr[rc] - coeff_ptr[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;
|
|
|
|
|
2013-03-04 23:12:17 +01:00
|
|
|
if ((abs(x)*dequant_ptr[rc != 0] > abs(coeff_ptr[rc]) * mul) &&
|
|
|
|
(abs(x)*dequant_ptr[rc != 0] < abs(coeff_ptr[rc]) * mul +
|
|
|
|
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
|
|
|
*/
|
2012-07-14 00:21:29 +02:00
|
|
|
t0 = tokens[next][0].token == DCT_EOB_TOKEN ?
|
|
|
|
DCT_EOB_TOKEN : ZERO_TOKEN;
|
|
|
|
t1 = tokens[next][1].token == DCT_EOB_TOKEN ?
|
|
|
|
DCT_EOB_TOKEN : ZERO_TOKEN;
|
|
|
|
} else {
|
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-05-09 19:47:58 +02:00
|
|
|
band = get_coef_band(band_translate, i + 1);
|
2012-07-14 00:21:29 +02:00
|
|
|
if (t0 != DCT_EOB_TOKEN) {
|
2013-07-01 19:40:00 +02:00
|
|
|
pt = trellis_get_coeff_context(scan, nb, i, t0, token_cache);
|
2013-06-28 05:57:37 +02:00
|
|
|
rate0 += mb->token_costs[tx_size][type][ref][!x][band][pt]
|
|
|
|
[tokens[next][0].token];
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
if (t1 != DCT_EOB_TOKEN) {
|
2013-07-01 19:40:00 +02:00
|
|
|
pt = trellis_get_coeff_context(scan, nb, i, t1, token_cache);
|
2013-06-28 05:57:37 +02:00
|
|
|
rate1 += mb->token_costs[tx_size][type][ref][!x][band][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;
|
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;
|
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
|
|
|
/* 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.
|
|
|
|
*/
|
|
|
|
else {
|
2013-05-09 19:47:58 +02:00
|
|
|
band = get_coef_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. */
|
|
|
|
if (t0 != DCT_EOB_TOKEN) {
|
2013-02-19 22:36:38 +01:00
|
|
|
tokens[next][0].rate +=
|
2013-06-28 05:57:37 +02:00
|
|
|
mb->token_costs[tx_size][type][ref][1][band][0][t0];
|
2012-07-14 00:21:29 +02:00
|
|
|
tokens[next][0].token = ZERO_TOKEN;
|
|
|
|
}
|
|
|
|
if (t1 != DCT_EOB_TOKEN) {
|
2013-02-19 22:36:38 +01:00
|
|
|
tokens[next][1].rate +=
|
2013-06-28 05:57:37 +02:00
|
|
|
mb->token_costs[tx_size][type][ref][1][band][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-05-09 19:47:58 +02:00
|
|
|
band = get_coef_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-06-28 05:57:37 +02:00
|
|
|
rate0 += mb->token_costs[tx_size][type][ref][0][band][pt][t0];
|
|
|
|
rate1 += mb->token_costs[tx_size][type][ref][0][band][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;
|
2013-03-28 18:42:23 +01:00
|
|
|
vpx_memset(qcoeff_ptr, 0, sizeof(*qcoeff_ptr) * (16 << (tx_size * 2)));
|
|
|
|
vpx_memset(dqcoeff_ptr, 0, sizeof(*dqcoeff_ptr) * (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];
|
2012-07-14 00:21:29 +02:00
|
|
|
qcoeff_ptr[rc] = x;
|
2013-03-04 23:12:17 +01:00
|
|
|
dqcoeff_ptr[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-04-30 18:54:51 +02:00
|
|
|
xd->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-04-30 20:29:27 +02:00
|
|
|
void vp9_optimize_b(int plane, int block, BLOCK_SIZE_TYPE bsize,
|
|
|
|
int ss_txfrm_size, VP9_COMMON *cm, MACROBLOCK *mb,
|
|
|
|
struct optimize_ctx *ctx) {
|
2013-05-31 21:30:32 +02:00
|
|
|
MACROBLOCKD *const xd = &mb->e_mbd;
|
2013-04-30 18:54:51 +02:00
|
|
|
int x, y;
|
2013-03-04 23:12:17 +01:00
|
|
|
|
2013-04-30 18:54:51 +02:00
|
|
|
// find current entropy context
|
|
|
|
txfrm_block_to_raster_xy(xd, bsize, plane, block, ss_txfrm_size, &x, &y);
|
2013-03-04 23:12:17 +01:00
|
|
|
|
2013-04-30 20:29:27 +02:00
|
|
|
optimize_b(cm, mb, plane, block, bsize,
|
2013-05-31 21:30:32 +02:00
|
|
|
&ctx->ta[plane][x], &ctx->tl[plane][y], ss_txfrm_size / 2);
|
2013-03-04 23:12:17 +01:00
|
|
|
}
|
|
|
|
|
2013-04-30 20:29:27 +02:00
|
|
|
static void optimize_block(int plane, int block, BLOCK_SIZE_TYPE bsize,
|
|
|
|
int ss_txfrm_size, void *arg) {
|
2013-07-24 00:59:58 +02:00
|
|
|
const struct encode_b_args* const args = arg;
|
2013-04-30 20:29:27 +02:00
|
|
|
vp9_optimize_b(plane, block, bsize, ss_txfrm_size, args->cm, args->x,
|
|
|
|
args->ctx);
|
|
|
|
}
|
|
|
|
|
2013-04-30 18:54:51 +02:00
|
|
|
void vp9_optimize_init(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize,
|
|
|
|
struct optimize_ctx *ctx) {
|
|
|
|
int p;
|
|
|
|
|
|
|
|
for (p = 0; p < MAX_MB_PLANE; p++) {
|
|
|
|
const struct macroblockd_plane* const plane = &xd->plane[p];
|
|
|
|
const int bwl = b_width_log2(bsize) - plane->subsampling_x;
|
|
|
|
const int bhl = b_height_log2(bsize) - plane->subsampling_y;
|
2013-06-10 15:48:58 +02:00
|
|
|
const MB_MODE_INFO *mbmi = &xd->mode_info_context->mbmi;
|
|
|
|
const TX_SIZE tx_size = p ? get_uv_tx_size(mbmi)
|
|
|
|
: mbmi->txfm_size;
|
2013-04-30 18:54:51 +02:00
|
|
|
int i, j;
|
|
|
|
|
|
|
|
for (i = 0; i < 1 << bwl; i += 1 << tx_size) {
|
|
|
|
int c = 0;
|
|
|
|
ctx->ta[p][i] = 0;
|
|
|
|
for (j = 0; j < 1 << tx_size && !c; j++) {
|
|
|
|
c = ctx->ta[p][i] |= plane->above_context[i + j];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (i = 0; i < 1 << bhl; i += 1 << tx_size) {
|
|
|
|
int c = 0;
|
|
|
|
ctx->tl[p][i] = 0;
|
|
|
|
for (j = 0; j < 1 << tx_size && !c; j++) {
|
|
|
|
c = ctx->tl[p][i] |= plane->left_context[i + j];
|
|
|
|
}
|
2013-04-10 06:28:27 +02:00
|
|
|
}
|
2013-03-04 23:12:17 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-31 21:30:32 +02:00
|
|
|
void vp9_optimize_sby(VP9_COMMON *cm, MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
|
2013-04-30 18:54:51 +02:00
|
|
|
struct optimize_ctx ctx;
|
2013-07-24 00:59:58 +02:00
|
|
|
struct encode_b_args arg = {cm, x, &ctx};
|
2013-04-30 18:54:51 +02:00
|
|
|
vp9_optimize_init(&x->e_mbd, bsize, &ctx);
|
2013-05-31 21:30:32 +02:00
|
|
|
foreach_transformed_block_in_plane(&x->e_mbd, bsize, 0, optimize_block, &arg);
|
2013-03-04 23:12:17 +01:00
|
|
|
}
|
|
|
|
|
2013-04-30 18:54:51 +02:00
|
|
|
void vp9_optimize_sbuv(VP9_COMMON *const cm, MACROBLOCK *x,
|
|
|
|
BLOCK_SIZE_TYPE bsize) {
|
|
|
|
struct optimize_ctx ctx;
|
2013-07-24 00:59:58 +02:00
|
|
|
struct encode_b_args arg = {cm, x, &ctx};
|
2013-04-30 18:54:51 +02:00
|
|
|
vp9_optimize_init(&x->e_mbd, bsize, &ctx);
|
|
|
|
foreach_transformed_block_uv(&x->e_mbd, bsize, optimize_block, &arg);
|
2013-03-04 23:12:17 +01:00
|
|
|
}
|
|
|
|
|
2013-07-02 01:50:58 +02:00
|
|
|
void xform_quant(int plane, int block, BLOCK_SIZE_TYPE bsize,
|
|
|
|
int ss_txfrm_size, void *arg) {
|
2013-04-30 20:29:27 +02:00
|
|
|
struct encode_b_args* const args = arg;
|
|
|
|
MACROBLOCK* const x = args->x;
|
|
|
|
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];
|
|
|
|
int16_t *coeff = BLOCK_OFFSET(p->coeff, block, 16);
|
|
|
|
int16_t *qcoeff = BLOCK_OFFSET(pd->qcoeff, block, 16);
|
|
|
|
int16_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block, 16);
|
|
|
|
const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size / 2);
|
|
|
|
const int16_t *scan, *iscan;
|
|
|
|
uint16_t *eob = &pd->eobs[block];
|
2013-07-23 15:51:44 +02:00
|
|
|
const int bwl = plane_block_width_log2by4(bsize, pd), bw = 1 << bwl;
|
2013-07-11 22:01:44 +02:00
|
|
|
const int twl = bwl - tx_size, twmask = (1 << twl) - 1;
|
|
|
|
int xoff, yoff;
|
|
|
|
int16_t *src_diff;
|
|
|
|
|
|
|
|
switch (tx_size) {
|
2013-04-30 20:29:27 +02:00
|
|
|
case TX_32X32:
|
2013-07-11 22:01:44 +02:00
|
|
|
scan = vp9_default_scan_32x32;
|
|
|
|
iscan = vp9_default_iscan_32x32;
|
|
|
|
block >>= 6;
|
|
|
|
xoff = 32 * (block & twmask);
|
|
|
|
yoff = 32 * (block >> twl);
|
|
|
|
src_diff = p->src_diff + 4 * bw * yoff + xoff;
|
2013-06-14 20:28:56 +02:00
|
|
|
if (x->rd_search)
|
2013-07-11 22:01:44 +02:00
|
|
|
vp9_short_fdct32x32_rd(src_diff, coeff, bw * 8);
|
2013-06-14 20:28:56 +02:00
|
|
|
else
|
2013-07-11 22:01:44 +02:00
|
|
|
vp9_short_fdct32x32(src_diff, coeff, bw * 8);
|
|
|
|
vp9_quantize_b_32x32(coeff, 1024, x->skip_block, p->zbin, p->round,
|
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
|
|
|
pd->dequant, p->zbin_extra, eob, scan, iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2013-07-23 21:21:48 +02:00
|
|
|
scan = vp9_default_scan_16x16;
|
|
|
|
iscan = vp9_default_iscan_16x16;
|
2013-07-11 22:01:44 +02:00
|
|
|
block >>= 4;
|
|
|
|
xoff = 16 * (block & twmask);
|
|
|
|
yoff = 16 * (block >> twl);
|
|
|
|
src_diff = p->src_diff + 4 * bw * yoff + xoff;
|
2013-07-23 21:21:48 +02:00
|
|
|
x->fwd_txm16x16(src_diff, coeff, bw * 8);
|
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,
|
|
|
|
pd->dequant, p->zbin_extra, eob, scan, iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2013-07-23 21:21:48 +02:00
|
|
|
scan = vp9_default_scan_8x8;
|
|
|
|
iscan = vp9_default_iscan_8x8;
|
2013-07-11 22:01:44 +02:00
|
|
|
block >>= 2;
|
|
|
|
xoff = 8 * (block & twmask);
|
|
|
|
yoff = 8 * (block >> twl);
|
|
|
|
src_diff = p->src_diff + 4 * bw * yoff + xoff;
|
2013-07-23 21:21:48 +02:00
|
|
|
x->fwd_txm8x8(src_diff, coeff, bw * 8);
|
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,
|
|
|
|
pd->dequant, p->zbin_extra, eob, scan, iscan);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_4X4:
|
2013-07-23 21:21:48 +02:00
|
|
|
scan = vp9_default_scan_4x4;
|
|
|
|
iscan = vp9_default_iscan_4x4;
|
2013-07-11 22:01:44 +02:00
|
|
|
xoff = 4 * (block & twmask);
|
|
|
|
yoff = 4 * (block >> twl);
|
|
|
|
src_diff = p->src_diff + 4 * bw * yoff + xoff;
|
2013-07-23 21:21:48 +02:00
|
|
|
x->fwd_txm4x4(src_diff, coeff, bw * 8);
|
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,
|
|
|
|
pd->dequant, p->zbin_extra, eob, scan, 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
|
|
|
}
|
|
|
|
|
|
|
|
static void encode_block(int plane, int block, BLOCK_SIZE_TYPE bsize,
|
|
|
|
int ss_txfrm_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-05-03 02:05:14 +02:00
|
|
|
const int raster_block = txfrm_block_to_raster_block(xd, bsize, plane,
|
|
|
|
block, ss_txfrm_size);
|
2013-05-31 21:30:32 +02:00
|
|
|
struct macroblockd_plane *const pd = &xd->plane[plane];
|
|
|
|
int16_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block, 16);
|
|
|
|
uint8_t *const dst = raster_block_offset_uint8(xd, bsize, plane,
|
2013-05-14 17:58:13 +02:00
|
|
|
raster_block,
|
2013-05-31 21:30:32 +02:00
|
|
|
pd->dst.buf, pd->dst.stride);
|
2013-05-03 02:05:14 +02:00
|
|
|
xform_quant(plane, block, bsize, ss_txfrm_size, arg);
|
|
|
|
|
2013-04-30 20:29:27 +02:00
|
|
|
if (x->optimize)
|
|
|
|
vp9_optimize_b(plane, block, bsize, ss_txfrm_size, args->cm, x, args->ctx);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-07-15 20:28:46 +02:00
|
|
|
if (x->skip_encode)
|
|
|
|
return;
|
2013-07-23 19:02:43 +02:00
|
|
|
if (pd->eobs[block] == 0)
|
|
|
|
return;
|
2013-07-15 20:28:46 +02:00
|
|
|
|
2013-04-30 20:29:27 +02:00
|
|
|
switch (ss_txfrm_size / 2) {
|
|
|
|
case TX_32X32:
|
2013-05-31 21:30:32 +02:00
|
|
|
vp9_short_idct32x32_add(dqcoeff, dst, pd->dst.stride);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_16X16:
|
2013-07-11 18:09:41 +02:00
|
|
|
vp9_short_idct16x16_add(dqcoeff, dst, pd->dst.stride);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
case TX_8X8:
|
2013-07-11 18:09:41 +02:00
|
|
|
vp9_short_idct8x8_add(dqcoeff, dst, pd->dst.stride);
|
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.
|
|
|
|
inverse_transform_b_4x4_add(xd, pd->eobs[block], dqcoeff,
|
|
|
|
dst, pd->dst.stride);
|
2013-04-30 20:29:27 +02:00
|
|
|
break;
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2013-05-31 21:30:32 +02:00
|
|
|
void vp9_xform_quant_sby(VP9_COMMON *cm, MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
|
2013-05-03 02:05:14 +02:00
|
|
|
MACROBLOCKD* const xd = &x->e_mbd;
|
2013-05-20 19:03:17 +02:00
|
|
|
struct encode_b_args arg = {cm, x, NULL};
|
2013-05-03 02:05:14 +02:00
|
|
|
|
2013-05-20 19:03:17 +02:00
|
|
|
foreach_transformed_block_in_plane(xd, bsize, 0, xform_quant, &arg);
|
2013-05-03 02:05:14 +02:00
|
|
|
}
|
|
|
|
|
2013-05-31 21:30:32 +02:00
|
|
|
void vp9_xform_quant_sbuv(VP9_COMMON *cm, MACROBLOCK *x,
|
|
|
|
BLOCK_SIZE_TYPE bsize) {
|
2013-05-03 02:05:14 +02:00
|
|
|
MACROBLOCKD* const xd = &x->e_mbd;
|
2013-05-20 19:03:17 +02:00
|
|
|
struct encode_b_args arg = {cm, x, NULL};
|
2013-05-03 02:05:14 +02:00
|
|
|
|
|
|
|
foreach_transformed_block_uv(xd, bsize, xform_quant, &arg);
|
|
|
|
}
|
|
|
|
|
2013-05-31 21:30:32 +02:00
|
|
|
void vp9_encode_sby(VP9_COMMON *cm, MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
2013-05-03 02:05:14 +02:00
|
|
|
struct optimize_ctx ctx;
|
2013-05-20 19:03:17 +02:00
|
|
|
struct encode_b_args arg = {cm, x, &ctx};
|
2013-05-03 02:05:14 +02:00
|
|
|
|
|
|
|
vp9_subtract_sby(x, bsize);
|
|
|
|
if (x->optimize)
|
|
|
|
vp9_optimize_init(xd, bsize, &ctx);
|
|
|
|
|
2013-05-20 19:03:17 +02:00
|
|
|
foreach_transformed_block_in_plane(xd, bsize, 0, encode_block, &arg);
|
2013-05-03 02:05:14 +02:00
|
|
|
}
|
|
|
|
|
2013-05-31 21:30:32 +02:00
|
|
|
void vp9_encode_sbuv(VP9_COMMON *cm, MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
2013-05-03 02:05:14 +02:00
|
|
|
struct optimize_ctx ctx;
|
2013-05-20 19:03:17 +02:00
|
|
|
struct encode_b_args arg = {cm, x, &ctx};
|
2013-05-03 02:05:14 +02:00
|
|
|
|
|
|
|
vp9_subtract_sbuv(x, bsize);
|
|
|
|
if (x->optimize)
|
|
|
|
vp9_optimize_init(xd, bsize, &ctx);
|
|
|
|
|
|
|
|
foreach_transformed_block_uv(xd, bsize, encode_block, &arg);
|
|
|
|
}
|
|
|
|
|
2013-05-31 21:30:32 +02:00
|
|
|
void vp9_encode_sb(VP9_COMMON *cm, MACROBLOCK *x, BLOCK_SIZE_TYPE bsize) {
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
2013-04-30 20:29:27 +02:00
|
|
|
struct optimize_ctx ctx;
|
2013-05-20 19:03:17 +02:00
|
|
|
struct encode_b_args arg = {cm, x, &ctx};
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-30 20:29:27 +02:00
|
|
|
vp9_subtract_sb(x, bsize);
|
|
|
|
if (x->optimize)
|
|
|
|
vp9_optimize_init(xd, bsize, &ctx);
|
2013-05-14 17:58:13 +02:00
|
|
|
|
2013-05-20 19:03:17 +02:00
|
|
|
foreach_transformed_block(xd, bsize, encode_block, &arg);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2013-05-16 02:21:15 +02:00
|
|
|
|
2013-07-02 01:50:58 +02:00
|
|
|
void encode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize,
|
2013-07-11 20:35:13 +02:00
|
|
|
int ss_txfrm_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-07-11 20:35:13 +02:00
|
|
|
MB_MODE_INFO *mbmi = &xd->mode_info_context->mbmi;
|
2013-05-16 02:21:15 +02:00
|
|
|
const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size / 2);
|
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-07-11 20:35:13 +02:00
|
|
|
int16_t *coeff = BLOCK_OFFSET(p->coeff, block, 16);
|
|
|
|
int16_t *qcoeff = BLOCK_OFFSET(pd->qcoeff, block, 16);
|
|
|
|
int16_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block, 16);
|
|
|
|
const int16_t *scan, *iscan;
|
2013-05-16 02:21:15 +02:00
|
|
|
TX_TYPE tx_type;
|
2013-07-11 20:35:13 +02:00
|
|
|
MB_PREDICTION_MODE mode;
|
|
|
|
const int bwl = b_width_log2(bsize) - pd->subsampling_x, bw = 1 << bwl;
|
|
|
|
const int twl = bwl - tx_size, twmask = (1 << twl) - 1;
|
|
|
|
int xoff, yoff;
|
|
|
|
uint8_t *src, *dst;
|
|
|
|
int16_t *src_diff;
|
|
|
|
uint16_t *eob = &pd->eobs[block];
|
2013-05-16 02:21:15 +02:00
|
|
|
|
2013-06-06 15:07:09 +02:00
|
|
|
if (xd->mb_to_right_edge < 0 || xd->mb_to_bottom_edge < 0) {
|
|
|
|
extend_for_intra(xd, plane, block, bsize, ss_txfrm_size);
|
|
|
|
}
|
|
|
|
|
2013-05-31 21:30:32 +02:00
|
|
|
// if (x->optimize)
|
|
|
|
// vp9_optimize_b(plane, block, bsize, ss_txfrm_size,
|
|
|
|
// args->cm, x, args->ctx);
|
|
|
|
|
2013-07-11 20:35:13 +02:00
|
|
|
switch (tx_size) {
|
2013-05-16 02:21:15 +02:00
|
|
|
case TX_32X32:
|
2013-07-11 20:35:13 +02:00
|
|
|
scan = vp9_default_scan_32x32;
|
|
|
|
iscan = vp9_default_iscan_32x32;
|
|
|
|
mode = plane == 0 ? mbmi->mode : mbmi->uv_mode;
|
|
|
|
block >>= 6;
|
|
|
|
xoff = 32 * (block & twmask);
|
|
|
|
yoff = 32 * (block >> twl);
|
|
|
|
dst = pd->dst.buf + yoff * pd->dst.stride + xoff;
|
|
|
|
src = p->src.buf + yoff * p->src.stride + xoff;
|
|
|
|
src_diff = p->src_diff + 4 * bw * yoff + xoff;
|
|
|
|
vp9_predict_intra_block(xd, block, bwl, TX_32X32, mode,
|
|
|
|
dst, pd->dst.stride, dst, pd->dst.stride);
|
|
|
|
vp9_subtract_block(32, 32, src_diff, bw * 4,
|
|
|
|
src, p->src.stride, dst, pd->dst.stride);
|
|
|
|
if (x->rd_search)
|
|
|
|
vp9_short_fdct32x32_rd(src_diff, coeff, bw * 8);
|
|
|
|
else
|
|
|
|
vp9_short_fdct32x32(src_diff, coeff, bw * 8);
|
|
|
|
vp9_quantize_b_32x32(coeff, 1024, x->skip_block, p->zbin, p->round,
|
|
|
|
p->quant, p->quant_shift, qcoeff, dqcoeff,
|
|
|
|
pd->dequant, p->zbin_extra, eob, scan, iscan);
|
2013-07-23 19:02:43 +02:00
|
|
|
if (!x->skip_encode && *eob)
|
2013-05-31 21:30:32 +02:00
|
|
|
vp9_short_idct32x32_add(dqcoeff, dst, pd->dst.stride);
|
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-07-11 20:35:13 +02:00
|
|
|
scan = get_scan_16x16(tx_type);
|
|
|
|
iscan = get_iscan_16x16(tx_type);
|
|
|
|
mode = plane == 0 ? mbmi->mode : mbmi->uv_mode;
|
|
|
|
block >>= 4;
|
|
|
|
xoff = 16 * (block & twmask);
|
|
|
|
yoff = 16 * (block >> twl);
|
|
|
|
dst = pd->dst.buf + yoff * pd->dst.stride + xoff;
|
|
|
|
src = p->src.buf + yoff * p->src.stride + xoff;
|
|
|
|
src_diff = p->src_diff + 4 * bw * yoff + xoff;
|
|
|
|
vp9_predict_intra_block(xd, block, bwl, TX_16X16, mode,
|
|
|
|
dst, pd->dst.stride, dst, pd->dst.stride);
|
|
|
|
vp9_subtract_block(16, 16, src_diff, bw * 4,
|
|
|
|
src, p->src.stride, dst, pd->dst.stride);
|
|
|
|
if (tx_type != DCT_DCT)
|
|
|
|
vp9_short_fht16x16(src_diff, coeff, bw * 4, tx_type);
|
2013-05-31 21:30:32 +02:00
|
|
|
else
|
2013-07-11 20:35:13 +02:00
|
|
|
x->fwd_txm16x16(src_diff, coeff, bw * 8);
|
|
|
|
vp9_quantize_b(coeff, 256, x->skip_block, p->zbin, p->round, p->quant,
|
|
|
|
p->quant_shift, qcoeff, dqcoeff,
|
|
|
|
pd->dequant, p->zbin_extra, eob, scan, iscan);
|
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)
|
|
|
|
vp9_short_idct16x16_add(dqcoeff, dst, pd->dst.stride);
|
|
|
|
else
|
|
|
|
vp9_short_iht16x16_add(dqcoeff, dst, pd->dst.stride, tx_type);
|
|
|
|
}
|
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-07-11 20:35:13 +02:00
|
|
|
scan = get_scan_8x8(tx_type);
|
|
|
|
iscan = get_iscan_8x8(tx_type);
|
|
|
|
mode = plane == 0 ? mbmi->mode : mbmi->uv_mode;
|
|
|
|
block >>= 2;
|
|
|
|
xoff = 8 * (block & twmask);
|
|
|
|
yoff = 8 * (block >> twl);
|
|
|
|
dst = pd->dst.buf + yoff * pd->dst.stride + xoff;
|
|
|
|
src = p->src.buf + yoff * p->src.stride + xoff;
|
|
|
|
src_diff = p->src_diff + 4 * bw * yoff + xoff;
|
|
|
|
vp9_predict_intra_block(xd, block, bwl, TX_8X8, mode,
|
|
|
|
dst, pd->dst.stride, dst, pd->dst.stride);
|
|
|
|
vp9_subtract_block(8, 8, src_diff, bw * 4,
|
|
|
|
src, p->src.stride, dst, pd->dst.stride);
|
|
|
|
if (tx_type != DCT_DCT)
|
|
|
|
vp9_short_fht8x8(src_diff, coeff, bw * 4, tx_type);
|
2013-05-31 21:30:32 +02:00
|
|
|
else
|
2013-07-11 20:35:13 +02:00
|
|
|
x->fwd_txm8x8(src_diff, coeff, bw * 8);
|
|
|
|
vp9_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round, p->quant,
|
|
|
|
p->quant_shift, qcoeff, dqcoeff,
|
|
|
|
pd->dequant, p->zbin_extra, eob, scan, iscan);
|
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)
|
|
|
|
vp9_short_idct8x8_add(dqcoeff, dst, pd->dst.stride);
|
|
|
|
else
|
|
|
|
vp9_short_iht8x8_add(dqcoeff, dst, pd->dst.stride, tx_type);
|
|
|
|
}
|
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-07-11 20:35:13 +02:00
|
|
|
scan = get_scan_4x4(tx_type);
|
|
|
|
iscan = get_iscan_4x4(tx_type);
|
|
|
|
if (mbmi->sb_type < BLOCK_SIZE_SB8X8 && plane == 0) {
|
|
|
|
mode = xd->mode_info_context->bmi[block].as_mode;
|
|
|
|
} else {
|
|
|
|
mode = plane == 0 ? mbmi->mode : mbmi->uv_mode;
|
|
|
|
}
|
|
|
|
xoff = 4 * (block & twmask);
|
|
|
|
yoff = 4 * (block >> twl);
|
|
|
|
dst = pd->dst.buf + yoff * pd->dst.stride + xoff;
|
|
|
|
src = p->src.buf + yoff * p->src.stride + xoff;
|
|
|
|
src_diff = p->src_diff + 4 * bw * yoff + xoff;
|
|
|
|
vp9_predict_intra_block(xd, block, bwl, TX_4X4, mode,
|
|
|
|
dst, pd->dst.stride, dst, pd->dst.stride);
|
|
|
|
vp9_subtract_block(4, 4, src_diff, bw * 4,
|
|
|
|
src, p->src.stride, dst, pd->dst.stride);
|
|
|
|
if (tx_type != DCT_DCT)
|
|
|
|
vp9_short_fht4x4(src_diff, coeff, bw * 4, tx_type);
|
2013-05-31 21:30:32 +02:00
|
|
|
else
|
2013-07-11 20:35:13 +02:00
|
|
|
x->fwd_txm4x4(src_diff, coeff, bw * 8);
|
|
|
|
vp9_quantize_b(coeff, 16, x->skip_block, p->zbin, p->round, p->quant,
|
|
|
|
p->quant_shift, qcoeff, dqcoeff,
|
|
|
|
pd->dequant, p->zbin_extra, eob, scan, iscan);
|
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.
|
|
|
|
inverse_transform_b_4x4_add(xd, *eob, dqcoeff,
|
|
|
|
dst, pd->dst.stride);
|
|
|
|
else
|
|
|
|
vp9_short_iht4x4_add(dqcoeff, dst, pd->dst.stride, tx_type);
|
|
|
|
}
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-31 21:30:32 +02:00
|
|
|
void vp9_encode_intra_block_y(VP9_COMMON *cm, MACROBLOCK *x,
|
2013-05-17 21:50:40 +02:00
|
|
|
BLOCK_SIZE_TYPE bsize) {
|
2013-05-16 02:21:15 +02:00
|
|
|
MACROBLOCKD* const xd = &x->e_mbd;
|
|
|
|
struct optimize_ctx ctx;
|
|
|
|
struct encode_b_args arg = {cm, x, &ctx};
|
|
|
|
|
|
|
|
foreach_transformed_block_in_plane(xd, bsize, 0,
|
|
|
|
encode_block_intra, &arg);
|
|
|
|
}
|
2013-05-31 21:30:32 +02:00
|
|
|
void vp9_encode_intra_block_uv(VP9_COMMON *cm, MACROBLOCK *x,
|
2013-05-17 21:50:40 +02:00
|
|
|
BLOCK_SIZE_TYPE bsize) {
|
|
|
|
MACROBLOCKD* const xd = &x->e_mbd;
|
|
|
|
struct optimize_ctx ctx;
|
|
|
|
struct encode_b_args arg = {cm, x, &ctx};
|
|
|
|
foreach_transformed_block_uv(xd, bsize, encode_block_intra, &arg);
|
|
|
|
}
|
2013-05-16 02:21:15 +02:00
|
|
|
|