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

Generalize EOB token stuffing.

Browse Source 
Change-Id: Ibb51f3f8c3575d4621890220b20887a13a46a04e
This commit is contained in:
Ronald S. Bultje 2012-10-24 16:59:00 -07:00
parent ce9f61ec50
commit cb9e6abf80
1 changed files with 88 additions and 242 deletions

330
vp8/encoder/tokenize.c

@ -930,87 +930,67 @@ void vp8_tokenize_initialize() {
fill_value_tokens(); fill_value_tokens();
} }
static __inline void stuff2nd_order_b_8x8(MACROBLOCKD *xd, static __inline void stuff_b(VP8_COMP *cpi,
const BLOCKD *const b, MACROBLOCKD *xd,
TOKENEXTRA **tp, const BLOCKD * const b,
ENTROPY_CONTEXT *a, TOKENEXTRA **tp,
ENTROPY_CONTEXT *l, PLANE_TYPE type,
VP8_COMP *cpi, ENTROPY_CONTEXT *a,
int dry_run) { ENTROPY_CONTEXT *l,
int pt; /* near block/prev token context index */ TX_SIZE tx_size,
TOKENEXTRA *t = *tp; /* store tokens starting here */ int dry_run) {
const int *bands;
unsigned int (*counts)[COEF_BANDS][PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS];
vp8_prob (*probs)[COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES];
int pt, band;
TOKENEXTRA *t = *tp;
const TX_TYPE tx_type = (type == PLANE_TYPE_Y_WITH_DC) ?
get_tx_type(xd, b) : DCT_DCT;
VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l); VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
(void) b;
t->Token = DCT_EOB_TOKEN; switch (tx_size) {
t->context_tree = cpi->common.fc.coef_probs_8x8[PLANE_TYPE_Y2][0][pt]; default:
// t->section = 11; case TX_4X4:
t->skip_eob_node = 0; bands = vp8_coef_bands;
++t; if (tx_type != DCT_DCT) {
counts = cpi->hybrid_coef_counts;
*tp = t; probs = cpi->common.fc.hybrid_coef_probs;
if (!dry_run) } else {
++cpi->coef_counts_8x8[PLANE_TYPE_Y2][0][pt][DCT_EOB_TOKEN]; counts = cpi->coef_counts;
pt = 0; probs = cpi->common.fc.coef_probs;
*a = *l = pt; }
} break;
case TX_8X8:
static __inline void stuff1st_order_b_8x8(MACROBLOCKD *xd, bands = vp8_coef_bands_8x8;
const BLOCKD *const b, if (tx_type != DCT_DCT) {
TOKENEXTRA **tp, counts = cpi->hybrid_coef_counts_8x8;
PLANE_TYPE type, probs = cpi->common.fc.hybrid_coef_probs_8x8;
ENTROPY_CONTEXT *a, } else {
ENTROPY_CONTEXT *l, counts = cpi->coef_counts_8x8;
VP8_COMP *cpi, probs = cpi->common.fc.coef_probs_8x8;
int dry_run) { }
int pt; /* near block/prev token context index */ break;
TOKENEXTRA *t = *tp; /* store tokens starting here */ case TX_16X16:
TX_TYPE tx_type = get_tx_type(xd, b); bands = vp8_coef_bands_16x16;
const int band = vp8_coef_bands_8x8[(type == PLANE_TYPE_Y_NO_DC) ? 1 : 0]; if (tx_type != DCT_DCT) {
VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l); counts = cpi->hybrid_coef_counts_16x16;
(void) b; probs = cpi->common.fc.hybrid_coef_probs_16x16;
} else {
t->Token = DCT_EOB_TOKEN; counts = cpi->coef_counts_16x16;
if (tx_type != DCT_DCT) probs = cpi->common.fc.coef_probs_16x16;
t->context_tree = cpi->common.fc.hybrid_coef_probs_8x8[type][band][pt]; }
else break;
t->context_tree = cpi->common.fc.coef_probs_8x8[type][band][pt];
// t->section = 8;
t->skip_eob_node = 0;
++t;
*tp = t;
if (!dry_run) {
if (tx_type == DCT_DCT)
++cpi->hybrid_coef_counts_8x8[type][band][pt][DCT_EOB_TOKEN];
else
++cpi->coef_counts_8x8[type][band][pt][DCT_EOB_TOKEN];
} }
pt = 0; /* 0 <-> all coeff data is zero */ band = bands[(type == PLANE_TYPE_Y_NO_DC) ? 1 : 0];
*a = *l = pt;
}
static __inline void stuff1st_order_buv_8x8(MACROBLOCKD *xd,
const BLOCKD *const b,
TOKENEXTRA **tp,
ENTROPY_CONTEXT *a,
ENTROPY_CONTEXT *l,
VP8_COMP *cpi,
int dry_run) {
int pt; /* near block/prev token context index */
TOKENEXTRA *t = *tp; /* store tokens starting here */
VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
(void) b;
t->Token = DCT_EOB_TOKEN; t->Token = DCT_EOB_TOKEN;
t->context_tree = cpi->common.fc.coef_probs_8x8[PLANE_TYPE_UV][0][pt]; t->context_tree = probs[type][band][pt];
// t->section = 13;
t->skip_eob_node = 0; t->skip_eob_node = 0;
++t; ++t;
*tp = t; *tp = t;
if (!dry_run) *a = *l = 0;
++cpi->coef_counts_8x8[PLANE_TYPE_UV][0][pt][DCT_EOB_TOKEN]; if (!dry_run) {
pt = 0; /* 0 <-> all coeff data is zero */ ++counts[type][band][pt][DCT_EOB_TOKEN];
*a = *l = pt; }
} }
static void vp8_stuff_mb_8x8(VP8_COMP *cpi, MACROBLOCKD *xd, static void vp8_stuff_mb_8x8(VP8_COMP *cpi, MACROBLOCKD *xd,
@ -1019,174 +999,52 @@ static void vp8_stuff_mb_8x8(VP8_COMP *cpi, MACROBLOCKD *xd,
ENTROPY_CONTEXT *L = (ENTROPY_CONTEXT *)xd->left_context; ENTROPY_CONTEXT *L = (ENTROPY_CONTEXT *)xd->left_context;
PLANE_TYPE plane_type; PLANE_TYPE plane_type;
int b; int b;
TOKENEXTRA *t_backup = *t; const int has_y2_block = (xd->mode_info_context->mbmi.mode != B_PRED &&
const int has_y2_block = (xd->mode_info_context->mbmi.mode != B_PRED xd->mode_info_context->mbmi.mode != I8X8_PRED &&
&& xd->mode_info_context->mbmi.mode != I8X8_PRED xd->mode_info_context->mbmi.mode != SPLITMV);
&& xd->mode_info_context->mbmi.mode != SPLITMV);
if (has_y2_block) { if (has_y2_block) {
stuff2nd_order_b_8x8(xd, xd->block + 24, t, stuff_b(cpi, xd, xd->block + 24, t, PLANE_TYPE_Y2,
A + vp8_block2above_8x8[24], A + vp8_block2above_8x8[24], L + vp8_block2left_8x8[24],
L + vp8_block2left_8x8[24], cpi, dry_run); TX_8X8, dry_run);
plane_type = PLANE_TYPE_Y_NO_DC; plane_type = PLANE_TYPE_Y_NO_DC;
} else { } else {
plane_type = PLANE_TYPE_Y_WITH_DC; plane_type = PLANE_TYPE_Y_WITH_DC;
} }
for (b = 0; b < 16; b += 4) { for (b = 0; b < 16; b += 4) {
stuff1st_order_b_8x8(xd, xd->block + b, t, plane_type, stuff_b(cpi, xd, xd->block + b, t, plane_type, A + vp8_block2above_8x8[b],
A + vp8_block2above_8x8[b], L + vp8_block2left_8x8[b], TX_8X8, dry_run);
L + vp8_block2left_8x8[b],
cpi, dry_run);
A[vp8_block2above_8x8[b] + 1] = A[vp8_block2above_8x8[b]]; A[vp8_block2above_8x8[b] + 1] = A[vp8_block2above_8x8[b]];
L[vp8_block2left_8x8[b] + 1] = L[vp8_block2left_8x8[b]]; L[vp8_block2left_8x8[b] + 1] = L[vp8_block2left_8x8[b]];
} }
for (b = 16; b < 24; b += 4) { for (b = 16; b < 24; b += 4) {
stuff1st_order_buv_8x8(xd, xd->block + b, t, stuff_b(cpi, xd, xd->block + b, t, PLANE_TYPE_UV,
A + vp8_block2above[b], A + vp8_block2above_8x8[b], L + vp8_block2left_8x8[b],
L + vp8_block2left[b], TX_8X8, dry_run);
cpi, dry_run);
A[vp8_block2above_8x8[b] + 1] = A[vp8_block2above_8x8[b]]; A[vp8_block2above_8x8[b] + 1] = A[vp8_block2above_8x8[b]];
L[vp8_block2left_8x8[b] + 1] = L[vp8_block2left_8x8[b]]; L[vp8_block2left_8x8[b] + 1] = L[vp8_block2left_8x8[b]];
} }
if (dry_run)
*t = t_backup;
}
static __inline void stuff1st_order_b_16x16(MACROBLOCKD *xd,
const BLOCKD *const b,
TOKENEXTRA **tp,
PLANE_TYPE type,
ENTROPY_CONTEXT *a,
ENTROPY_CONTEXT *l,
VP8_COMP *cpi,
int dry_run) {
int pt; /* near block/prev token context index */
TOKENEXTRA *t = *tp; /* store tokens starting here */
TX_TYPE tx_type = get_tx_type(xd, b);
const int band = vp8_coef_bands_16x16[(type == PLANE_TYPE_Y_NO_DC) ? 1 : 0];
VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
(void) b;
t->Token = DCT_EOB_TOKEN;
if (tx_type != DCT_DCT)
t->context_tree = cpi->common.fc.hybrid_coef_probs_16x16[type][band][pt];
else
t->context_tree = cpi->common.fc.coef_probs_16x16[type][band][pt];
t->skip_eob_node = 0;
++t;
*tp = t;
if (!dry_run) {
if (tx_type != DCT_DCT)
++cpi->hybrid_coef_counts_16x16[type][band][pt][DCT_EOB_TOKEN];
else
++cpi->coef_counts_16x16[type][band][pt][DCT_EOB_TOKEN];
}
pt = 0; /* 0 <-> all coeff data is zero */
*a = *l = pt;
} }
static void vp8_stuff_mb_16x16(VP8_COMP *cpi, MACROBLOCKD *xd, static void vp8_stuff_mb_16x16(VP8_COMP *cpi, MACROBLOCKD *xd,
TOKENEXTRA **t, int dry_run) { TOKENEXTRA **t, int dry_run) {
ENTROPY_CONTEXT * A = (ENTROPY_CONTEXT *)xd->above_context; ENTROPY_CONTEXT * A = (ENTROPY_CONTEXT *)xd->above_context;
ENTROPY_CONTEXT * L = (ENTROPY_CONTEXT *)xd->left_context; ENTROPY_CONTEXT * L = (ENTROPY_CONTEXT *)xd->left_context;
int b, i; int b;
TOKENEXTRA *t_backup = *t;
stuff1st_order_b_16x16(xd, xd->block, t, PLANE_TYPE_Y_WITH_DC, stuff_b(cpi, xd, xd->block, t, PLANE_TYPE_Y_WITH_DC, A, L, TX_16X16, dry_run);
A, L, cpi, dry_run);
A[1] = A[2] = A[3] = A[0]; A[1] = A[2] = A[3] = A[0];
L[1] = L[2] = L[3] = L[0]; L[1] = L[2] = L[3] = L[0];
for (b = 16; b < 24; b += 4) { for (b = 16; b < 24; b += 4) {
stuff1st_order_buv_8x8(xd, xd->block + b, t, stuff_b(cpi, xd, xd->block + b, t, PLANE_TYPE_UV, A + vp8_block2above[b],
A + vp8_block2above[b], L + vp8_block2above_8x8[b], TX_8X8, dry_run);
L + vp8_block2left[b],
cpi, dry_run);
A[vp8_block2above_8x8[b] + 1] = A[vp8_block2above_8x8[b]]; A[vp8_block2above_8x8[b] + 1] = A[vp8_block2above_8x8[b]];
L[vp8_block2left_8x8[b] + 1] = L[vp8_block2left_8x8[b]]; L[vp8_block2left_8x8[b] + 1] = L[vp8_block2left_8x8[b]];
} }
vpx_memset(&A[8], 0, sizeof(A[8])); vpx_memset(&A[8], 0, sizeof(A[8]));
vpx_memset(&L[8], 0, sizeof(L[8])); vpx_memset(&L[8], 0, sizeof(L[8]));
if (dry_run)
*t = t_backup;
}
static __inline void stuff2nd_order_b_4x4(MACROBLOCKD *xd,
const BLOCKD *const b,
TOKENEXTRA **tp,
ENTROPY_CONTEXT *a,
ENTROPY_CONTEXT *l,
VP8_COMP *cpi,
int dry_run) {
int pt; /* near block/prev token context index */
TOKENEXTRA *t = *tp; /* store tokens starting here */
VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
t->Token = DCT_EOB_TOKEN;
t->context_tree = cpi->common.fc.coef_probs[PLANE_TYPE_Y2][0][pt];
t->skip_eob_node = 0;
++t;
*tp = t;
if (!dry_run)
++cpi->coef_counts[PLANE_TYPE_Y2][0][pt] [DCT_EOB_TOKEN];
pt = 0;
*a = *l = pt;
}
static __inline void stuff1st_order_b_4x4(MACROBLOCKD *xd,
const BLOCKD *const b,
TOKENEXTRA **tp,
PLANE_TYPE type,
ENTROPY_CONTEXT *a,
ENTROPY_CONTEXT *l,
VP8_COMP *cpi,
int dry_run) {
int pt; /* near block/prev token context index */
TOKENEXTRA *t = *tp; /* store tokens starting here */
TX_TYPE tx_type = get_tx_type(xd, b);
const int band = vp8_coef_bands[(type == PLANE_TYPE_Y_NO_DC) ? 1 : 0];
VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
t->Token = DCT_EOB_TOKEN;
if (tx_type != DCT_DCT)
t->context_tree = cpi->common.fc.hybrid_coef_probs[type][band][pt];
else
t->context_tree = cpi->common.fc.coef_probs[type][band][pt];
t->skip_eob_node = 0;
++t;
*tp = t;
if (!dry_run) {
if (tx_type != DCT_DCT)
++cpi->hybrid_coef_counts[type][band][pt][DCT_EOB_TOKEN];
else
++cpi->coef_counts[type][band][pt][DCT_EOB_TOKEN];
}
pt = 0; /* 0 <-> all coeff data is zero */
*a = *l = pt;
}
static __inline void stuff1st_order_buv_4x4(MACROBLOCKD *xd,
const BLOCKD *const b,
TOKENEXTRA **tp,
ENTROPY_CONTEXT *a,
ENTROPY_CONTEXT *l,
VP8_COMP *cpi,
int dry_run) {
int pt; /* near block/prev token context index */
TOKENEXTRA *t = *tp; /* store tokens starting here */
VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
t->Token = DCT_EOB_TOKEN;
t->context_tree = cpi->common.fc.coef_probs[PLANE_TYPE_UV][0][pt];
t->skip_eob_node = 0;
++t;
*tp = t;
if (!dry_run)
++cpi->coef_counts[PLANE_TYPE_UV][0][pt][DCT_EOB_TOKEN];
pt = 0; /* 0 <-> all coeff data is zero */
*a = *l = pt;
} }
static void vp8_stuff_mb_4x4(VP8_COMP *cpi, MACROBLOCKD *xd, static void vp8_stuff_mb_4x4(VP8_COMP *cpi, MACROBLOCKD *xd,
@ -1194,36 +1052,26 @@ static void vp8_stuff_mb_4x4(VP8_COMP *cpi, MACROBLOCKD *xd,
ENTROPY_CONTEXT *A = (ENTROPY_CONTEXT *)xd->above_context; ENTROPY_CONTEXT *A = (ENTROPY_CONTEXT *)xd->above_context;
ENTROPY_CONTEXT *L = (ENTROPY_CONTEXT *)xd->left_context; ENTROPY_CONTEXT *L = (ENTROPY_CONTEXT *)xd->left_context;
int b; int b;
TOKENEXTRA *t_backup = *t;
PLANE_TYPE plane_type; PLANE_TYPE plane_type;
const int has_y2_block = (xd->mode_info_context->mbmi.mode != B_PRED const int has_y2_block = (xd->mode_info_context->mbmi.mode != B_PRED &&
&& xd->mode_info_context->mbmi.mode != I8X8_PRED xd->mode_info_context->mbmi.mode != I8X8_PRED &&
&& xd->mode_info_context->mbmi.mode != SPLITMV); xd->mode_info_context->mbmi.mode != SPLITMV);
if (has_y2_block) { if (has_y2_block) {
stuff2nd_order_b_4x4(xd, xd->block + 24, t, stuff_b(cpi, xd, xd->block + 24, t, PLANE_TYPE_Y2, A + vp8_block2above[24],
A + vp8_block2above[24], L + vp8_block2left[24], TX_4X4, dry_run);
L + vp8_block2left[24],
cpi, dry_run);
plane_type = PLANE_TYPE_Y_NO_DC; plane_type = PLANE_TYPE_Y_NO_DC;
} else { } else {
plane_type = PLANE_TYPE_Y_WITH_DC; plane_type = PLANE_TYPE_Y_WITH_DC;
} }
for (b = 0; b < 16; b++) for (b = 0; b < 16; b++)
stuff1st_order_b_4x4(xd, xd->block + b, t, plane_type, stuff_b(cpi, xd, xd->block + b, t, plane_type, A + vp8_block2above[b],
A + vp8_block2above[b], L + vp8_block2left[b], TX_4X4, dry_run);
L + vp8_block2left[b],
cpi, dry_run);
for (b = 16; b < 24; b++) for (b = 16; b < 24; b++)
stuff1st_order_buv_4x4(xd, xd->block + b, t, stuff_b(cpi, xd, xd->block + b, t, PLANE_TYPE_UV, A + vp8_block2above[b],
A + vp8_block2above[b], L + vp8_block2left[b], TX_4X4, dry_run);
L + vp8_block2left[b],
cpi, dry_run);
if (dry_run)
*t = t_backup;
} }
static void vp8_stuff_mb_8x8_4x4uv(VP8_COMP *cpi, MACROBLOCKD *xd, static void vp8_stuff_mb_8x8_4x4uv(VP8_COMP *cpi, MACROBLOCKD *xd,
@ -1231,29 +1079,23 @@ static void vp8_stuff_mb_8x8_4x4uv(VP8_COMP *cpi, MACROBLOCKD *xd,
ENTROPY_CONTEXT *A = (ENTROPY_CONTEXT *)xd->above_context; ENTROPY_CONTEXT *A = (ENTROPY_CONTEXT *)xd->above_context;
ENTROPY_CONTEXT *L = (ENTROPY_CONTEXT *)xd->left_context; ENTROPY_CONTEXT *L = (ENTROPY_CONTEXT *)xd->left_context;
int b; int b;
TOKENEXTRA *t_backup = *t;
for (b = 0; b < 16; b += 4) { for (b = 0; b < 16; b += 4) {
stuff1st_order_b_8x8(xd, xd->block + b, t, PLANE_TYPE_Y_WITH_DC, stuff_b(cpi, xd, xd->block + b, t, PLANE_TYPE_Y_WITH_DC,
A + vp8_block2above_8x8[b], A + vp8_block2above_8x8[b], L + vp8_block2left_8x8[b],
L + vp8_block2left_8x8[b], TX_8X8, dry_run);
cpi, dry_run);
A[vp8_block2above_8x8[b] + 1] = A[vp8_block2above_8x8[b]]; A[vp8_block2above_8x8[b] + 1] = A[vp8_block2above_8x8[b]];
L[vp8_block2left_8x8[b] + 1] = L[vp8_block2left_8x8[b]]; L[vp8_block2left_8x8[b] + 1] = L[vp8_block2left_8x8[b]];
} }
for (b = 16; b < 24; b++) for (b = 16; b < 24; b++)
stuff1st_order_buv_4x4(xd, xd->block + b, t, stuff_b(cpi, xd, xd->block + b, t, PLANE_TYPE_UV, A + vp8_block2above[b],
A + vp8_block2above[b], L + vp8_block2left[b], TX_4X4, dry_run);
L + vp8_block2left[b],
cpi, dry_run);
if (dry_run)
*t = t_backup;
} }
void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *xd, TOKENEXTRA **t, int dry_run) { void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *xd, TOKENEXTRA **t, int dry_run) {
TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size; TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size;
TOKENEXTRA * const t_backup = *t;
if (tx_size == TX_16X16) { if (tx_size == TX_16X16) {
vp8_stuff_mb_16x16(cpi, xd, t, dry_run); vp8_stuff_mb_16x16(cpi, xd, t, dry_run);
@ -1267,6 +1109,10 @@ void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *xd, TOKENEXTRA **t, int dry_run) {
} else { } else {
vp8_stuff_mb_4x4(cpi, xd, t, dry_run); vp8_stuff_mb_4x4(cpi, xd, t, dry_run);
} }
if (dry_run) {
*t = t_backup;
}
} }
void vp8_fix_contexts(MACROBLOCKD *xd) { void vp8_fix_contexts(MACROBLOCKD *xd) {