OSUOSL/Nero are experiencing Internet connectivity problems. This affects us as we're hosted with OSUOSL. We apologize for the inconvenience.

Commit 976a9b93 authored by Hui Su's avatar Hui Su Committed by Gerrit Code Review

Merge "Remove unnecessary buffer pointers in PICK_MODE_CONTEXT" into nextgenv2

parents 8b7e4dba 71c625d7
......@@ -44,10 +44,6 @@ static void alloc_mode_context(VP10_COMMON *cm, int num_4x4_blk,
vpx_memalign(32, num_pix * sizeof(*ctx->dqcoeff[i][k])));
CHECK_MEM_ERROR(cm, ctx->eobs[i][k],
vpx_memalign(32, num_blk * sizeof(*ctx->eobs[i][k])));
ctx->coeff_pbuf[i][k] = ctx->coeff[i][k];
ctx->qcoeff_pbuf[i][k] = ctx->qcoeff[i][k];
ctx->dqcoeff_pbuf[i][k] = ctx->dqcoeff[i][k];
ctx->eobs_pbuf[i][k] = ctx->eobs[i][k];
}
}
......
......@@ -30,17 +30,13 @@ typedef struct {
#if CONFIG_VAR_TX
uint8_t *blk_skip[MAX_MB_PLANE];
#endif
// dual buffer pointers, 0: in use, 1: best in store
tran_low_t *coeff[MAX_MB_PLANE][3];
tran_low_t *qcoeff[MAX_MB_PLANE][3];
tran_low_t *dqcoeff[MAX_MB_PLANE][3];
uint16_t *eobs[MAX_MB_PLANE][3];
// dual buffer pointers, 0: in use, 1: best in store
tran_low_t *coeff_pbuf[MAX_MB_PLANE][3];
tran_low_t *qcoeff_pbuf[MAX_MB_PLANE][3];
tran_low_t *dqcoeff_pbuf[MAX_MB_PLANE][3];
uint16_t *eobs_pbuf[MAX_MB_PLANE][3];
int is_coded;
int num_4x4_blk;
int skip;
......
......@@ -1098,17 +1098,17 @@ static void update_state(VP10_COMP *cpi, ThreadData *td, PICK_MODE_CONTEXT *ctx,
max_plane = is_inter_block(mbmi) ? MAX_MB_PLANE : 1;
for (i = 0; i < max_plane; ++i) {
p[i].coeff = ctx->coeff_pbuf[i][1];
p[i].qcoeff = ctx->qcoeff_pbuf[i][1];
pd[i].dqcoeff = ctx->dqcoeff_pbuf[i][1];
p[i].eobs = ctx->eobs_pbuf[i][1];
p[i].coeff = ctx->coeff[i][1];
p[i].qcoeff = ctx->qcoeff[i][1];
pd[i].dqcoeff = ctx->dqcoeff[i][1];
p[i].eobs = ctx->eobs[i][1];
}
for (i = max_plane; i < MAX_MB_PLANE; ++i) {
p[i].coeff = ctx->coeff_pbuf[i][2];
p[i].qcoeff = ctx->qcoeff_pbuf[i][2];
pd[i].dqcoeff = ctx->dqcoeff_pbuf[i][2];
p[i].eobs = ctx->eobs_pbuf[i][2];
p[i].coeff = ctx->coeff[i][2];
p[i].qcoeff = ctx->qcoeff[i][2];
pd[i].dqcoeff = ctx->dqcoeff[i][2];
p[i].eobs = ctx->eobs[i][2];
}
for (i = 0; i < 2; ++i) pd[i].color_index_map = ctx->color_index_map[i];
......@@ -1475,10 +1475,10 @@ static void update_state_sb_supertx(VP10_COMP *cpi, ThreadData *td,
for (i = 0; i < MAX_MB_PLANE; ++i) {
if (pmc != NULL) {
p[i].coeff = pmc->coeff_pbuf[i][1];
p[i].qcoeff = pmc->qcoeff_pbuf[i][1];
pd[i].dqcoeff = pmc->dqcoeff_pbuf[i][1];
p[i].eobs = pmc->eobs_pbuf[i][1];
p[i].coeff = pmc->coeff[i][1];
p[i].qcoeff = pmc->qcoeff[i][1];
pd[i].dqcoeff = pmc->dqcoeff[i][1];
p[i].eobs = pmc->eobs[i][1];
} else {
// These should never be used
p[i].coeff = NULL;
......@@ -1642,10 +1642,10 @@ static void rd_pick_sb_modes(VP10_COMP *cpi, TileDataEnc *tile_data,
#endif
for (i = 0; i < MAX_MB_PLANE; ++i) {
p[i].coeff = ctx->coeff_pbuf[i][0];
p[i].qcoeff = ctx->qcoeff_pbuf[i][0];
pd[i].dqcoeff = ctx->dqcoeff_pbuf[i][0];
p[i].eobs = ctx->eobs_pbuf[i][0];
p[i].coeff = ctx->coeff[i][0];
p[i].qcoeff = ctx->qcoeff[i][0];
pd[i].dqcoeff = ctx->dqcoeff[i][0];
p[i].eobs = ctx->eobs[i][0];
}
for (i = 0; i < 2; ++i) pd[i].color_index_map = ctx->color_index_map[i];
......
......@@ -526,10 +526,10 @@ void vp10_first_pass(VP10_COMP *cpi, const struct lookahead_entry *source) {
vp10_frame_init_quantizer(cpi);
for (i = 0; i < MAX_MB_PLANE; ++i) {
p[i].coeff = ctx->coeff_pbuf[i][1];
p[i].qcoeff = ctx->qcoeff_pbuf[i][1];
pd[i].dqcoeff = ctx->dqcoeff_pbuf[i][1];
p[i].eobs = ctx->eobs_pbuf[i][1];
p[i].coeff = ctx->coeff[i][1];
p[i].qcoeff = ctx->qcoeff[i][1];
pd[i].dqcoeff = ctx->dqcoeff[i][1];
p[i].eobs = ctx->eobs[i][1];
}
vp10_init_mv_probs(cm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment