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

Remove unnecessary buffer pointers in PICK_MODE_CONTEXT

Browse Source 
Change-Id: I600af6a66dc0e1310c8bfc7c16efa8a82e90856d
This commit is contained in:
hui su
2016-08-24 12:16:51 -07:00
parent 35d4524b5b
commit 71c625d758
4 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vp10/encoder/context_tree.c
View File

@@ -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]))); vpx_memalign(32, num_pix * sizeof(*ctx->dqcoeff[i][k])));
CHECK_MEM_ERROR(cm, ctx->eobs[i][k], CHECK_MEM_ERROR(cm, ctx->eobs[i][k],
vpx_memalign(32, num_blk * sizeof(*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];
} }
} }

8
vp10/encoder/context_tree.h
View File

@@ -30,17 +30,13 @@ typedef struct {
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
uint8_t *blk_skip[MAX_MB_PLANE]; uint8_t *blk_skip[MAX_MB_PLANE];
#endif #endif
// dual buffer pointers, 0: in use, 1: best in store
tran_low_t *coeff[MAX_MB_PLANE][3]; tran_low_t *coeff[MAX_MB_PLANE][3];
tran_low_t *qcoeff[MAX_MB_PLANE][3]; tran_low_t *qcoeff[MAX_MB_PLANE][3];
tran_low_t *dqcoeff[MAX_MB_PLANE][3]; tran_low_t *dqcoeff[MAX_MB_PLANE][3];
uint16_t *eobs[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 is_coded;
int num_4x4_blk; int num_4x4_blk;
int skip; int skip;

32
vp10/encoder/encodeframe.c
View File

@@ -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; max_plane = is_inter_block(mbmi) ? MAX_MB_PLANE : 1;
for (i = 0; i < max_plane; ++i) { for (i = 0; i < max_plane; ++i) {
p[i].coeff = ctx->coeff_pbuf[i][1]; p[i].coeff = ctx->coeff[i][1];
p[i].qcoeff = ctx->qcoeff_pbuf[i][1]; p[i].qcoeff = ctx->qcoeff[i][1];
pd[i].dqcoeff = ctx->dqcoeff_pbuf[i][1]; pd[i].dqcoeff = ctx->dqcoeff[i][1];
p[i].eobs = ctx->eobs_pbuf[i][1]; p[i].eobs = ctx->eobs[i][1];
} }
for (i = max_plane; i < MAX_MB_PLANE; ++i) { for (i = max_plane; i < MAX_MB_PLANE; ++i) {
p[i].coeff = ctx->coeff_pbuf[i][2]; p[i].coeff = ctx->coeff[i][2];
p[i].qcoeff = ctx->qcoeff_pbuf[i][2]; p[i].qcoeff = ctx->qcoeff[i][2];
pd[i].dqcoeff = ctx->dqcoeff_pbuf[i][2]; pd[i].dqcoeff = ctx->dqcoeff[i][2];
p[i].eobs = ctx->eobs_pbuf[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]; 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) { for (i = 0; i < MAX_MB_PLANE; ++i) {
if (pmc != NULL) { if (pmc != NULL) {
p[i].coeff = pmc->coeff_pbuf[i][1]; p[i].coeff = pmc->coeff[i][1];
p[i].qcoeff = pmc->qcoeff_pbuf[i][1]; p[i].qcoeff = pmc->qcoeff[i][1];
pd[i].dqcoeff = pmc->dqcoeff_pbuf[i][1]; pd[i].dqcoeff = pmc->dqcoeff[i][1];
p[i].eobs = pmc->eobs_pbuf[i][1]; p[i].eobs = pmc->eobs[i][1];
} else { } else {
// These should never be used // These should never be used
p[i].coeff = NULL; p[i].coeff = NULL;
@@ -1642,10 +1642,10 @@ static void rd_pick_sb_modes(VP10_COMP *cpi, TileDataEnc *tile_data,
#endif #endif
for (i = 0; i < MAX_MB_PLANE; ++i) { for (i = 0; i < MAX_MB_PLANE; ++i) {
p[i].coeff = ctx->coeff_pbuf[i][0]; p[i].coeff = ctx->coeff[i][0];
p[i].qcoeff = ctx->qcoeff_pbuf[i][0]; p[i].qcoeff = ctx->qcoeff[i][0];
pd[i].dqcoeff = ctx->dqcoeff_pbuf[i][0]; pd[i].dqcoeff = ctx->dqcoeff[i][0];
p[i].eobs = ctx->eobs_pbuf[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]; for (i = 0; i < 2; ++i) pd[i].color_index_map = ctx->color_index_map[i];

8
vp10/encoder/firstpass.c
View File

@@ -526,10 +526,10 @@ void vp10_first_pass(VP10_COMP *cpi, const struct lookahead_entry *source) {
vp10_frame_init_quantizer(cpi); vp10_frame_init_quantizer(cpi);
for (i = 0; i < MAX_MB_PLANE; ++i) { for (i = 0; i < MAX_MB_PLANE; ++i) {
p[i].coeff = ctx->coeff_pbuf[i][1]; p[i].coeff = ctx->coeff[i][1];
p[i].qcoeff = ctx->qcoeff_pbuf[i][1]; p[i].qcoeff = ctx->qcoeff[i][1];
pd[i].dqcoeff = ctx->dqcoeff_pbuf[i][1]; pd[i].dqcoeff = ctx->dqcoeff[i][1];
p[i].eobs = ctx->eobs_pbuf[i][1]; p[i].eobs = ctx->eobs[i][1];
} }
vp10_init_mv_probs(cm); vp10_init_mv_probs(cm);