generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable optimize_b for intra blocks

Browse Source 
Coding gain
lowres 0.13%
midres 0.36%

Change-Id: Ia65d2d7513685dfcffbe3939fea473fb6d7036b9
This commit is contained in:
hui su 2016-05-05 17:36:04 -07:00
parent 6d9bec4366
commit 5af706210b
4 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/encoder/vp9_encodeframe.c
View File

@ -4872,7 +4872,7 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
mbmi->skip = 1;
#endif
for (plane = 0; plane < MAX_MB_PLANE; ++plane)
vp9_encode_intra_block_plane(x, MAX(bsize, BLOCK_8X8), plane);
vp9_encode_intra_block_plane(x, MAX(bsize, BLOCK_8X8), plane, 1);
if (output_enabled)
sum_intra_stats(&cm->counts,
#if CONFIG_FILTERINTRA

40
vp9/encoder/vp9_encodemb.c
View File

@ -107,7 +107,7 @@ typedef struct vp9_token_state {
int error;
int next;
signed char token;
short qc;
tran_low_t qc;
} vp9_token_state;
// TODO(jimbankoski): experiment to find optimal RD numbers.
@ -3010,6 +3010,10 @@ static void encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
const int src_stride = p->src.stride;
const int dst_stride = pd->dst.stride;
int i, j;
struct optimize_ctx *const ctx = args->ctx;
ENTROPY_CONTEXT *a = NULL;
ENTROPY_CONTEXT *l = NULL;
int entropy_ctx = 0;
#if CONFIG_NEW_QUANT
int dq = xd->mi->mbmi.dq_off_index;
const uint8_t* band = get_band_translate(tx_size);
@ -3029,6 +3033,11 @@ static void encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
dst = &pd->dst.buf[4 * (j * dst_stride + i)];
src = &p->src.buf[4 * (j * src_stride + i)];
src_diff = &p->src_diff[4 * (j * diff_stride + i)];
if (args->ctx != NULL) {
a = &ctx->ta[plane][i];
l = &ctx->tl[plane][j];
entropy_ctx = combine_entropy_contexts(*a, *l);
}
#if CONFIG_SR_MODE
src_sr_diff = (int16_t *)&p->src_sr_diff[4 * (j * src_sr_diff_stride + i)];
#endif // CONFIG_SR_MODE
@ -3793,6 +3802,9 @@ static void encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
pd->dequant, eob, scan_order->scan,
scan_order->iscan);
#endif // CONFIG_NEW_QUANT
if (args->ctx != NULL) {
*a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
}
if (*eob)
vp9_idct32x32_add(dqcoeff, dst, dst_stride, *eob);
#if CONFIG_SR_MODE
@ -3876,6 +3888,9 @@ static void encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
pd->dequant, eob, scan_order->scan,
scan_order->iscan);
#endif // CONFIG_NEW_QUANT
if (args->ctx != NULL) {
*a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
}
if (*eob)
vp9_iht16x16_add(tx_type, dqcoeff, dst, dst_stride, *eob);
#if CONFIG_SR_MODE
@ -3962,6 +3977,9 @@ static void encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
pd->dequant, eob, scan_order->scan,
scan_order->iscan);
#endif // CONFIG_NEW_QUANT
if (args->ctx != NULL) {
*a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
}
if (*eob)
vp9_iht8x8_add(tx_type, dqcoeff, dst, dst_stride, *eob);
#if CONFIG_SR_MODE
@ -4002,6 +4020,9 @@ static void encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
pd->dequant, eob, scan_order->scan,
scan_order->iscan);
#endif // CONFIG_NEW_QUANT
if (args->ctx != NULL) {
*a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
}
}
if (!x->skip_encode && *eob) {
@ -4030,10 +4051,23 @@ void vp9_encode_block_intra(MACROBLOCK *x, int plane, int block,
}
void vp9_encode_intra_block_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane) {
void vp9_encode_intra_block_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane,
int enable_optimize_b) {
const MACROBLOCKD *const xd = &x->e_mbd;
struct encode_b_args arg = {x, NULL, &xd->mi[0].src_mi->mbmi.skip};
struct optimize_ctx ctx;
struct encode_b_args arg = {x, &ctx, &xd->mi[0].src_mi->mbmi.skip};
if (enable_optimize_b && x->optimize &&
(!x->skip_recode || !x->skip_optimize)) {
const struct macroblockd_plane* const pd = &xd->plane[plane];
const TX_SIZE tx_size = plane ?
get_uv_tx_size(&xd->mi[0].src_mi->mbmi, pd) :
xd->mi[0].src_mi->mbmi.tx_size;
vp9_get_entropy_contexts(bsize, tx_size, pd,
ctx.ta[plane], ctx.tl[plane]);
} else {
arg.ctx = NULL;
}
vp9_foreach_transformed_block_in_plane(xd, bsize, plane, encode_block_intra,
&arg);
}

3
vp9/encoder/vp9_encodemb.h
View File

@ -46,7 +46,8 @@ void vp9_encode_block_intra(MACROBLOCK *x, int plane, int block,
BLOCK_SIZE plane_bsize, TX_SIZE tx_size,
int8_t *skip);
void vp9_encode_intra_block_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane);
void vp9_encode_intra_block_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane,
int enable_optimize_b);
#if CONFIG_SR_MODE
void inv_trfm_sr(MACROBLOCK * x, TX_SIZE tx_size,

2
vp9/encoder/vp9_firstpass.c
View File

@ -557,7 +557,7 @@ void vp9_first_pass(VP9_COMP *cpi, const struct lookahead_entry *source) {
xd->mi[0].src_mi->mbmi.tx_skip[0] = 0;
xd->mi[0].src_mi->mbmi.tx_skip[1] = 0;
#endif
vp9_encode_intra_block_plane(x, bsize, 0);
vp9_encode_intra_block_plane(x, bsize, 0, 0);
this_error = vp9_get_mb_ss(x->plane[0].src_diff);
#if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth) {