diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 9b48dc97a382219c57623991cdc6172d82a3622f..a33322c8985e449109d4e4708486d5d6611b31ac 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -448,6 +448,9 @@ void vp9_entropy_mode_init() { void vp9_init_mode_contexts(VP9_COMMON *pc) { vpx_memset(pc->fc.mv_ref_ct, 0, sizeof(pc->fc.mv_ref_ct)); + vpx_memcpy(pc->fc.vp9_mode_contexts, + vp9_default_mode_contexts, + sizeof(vp9_default_mode_contexts)); } void vp9_accum_mv_refs(VP9_COMMON *pc, diff --git a/vp9/common/vp9_modecont.c b/vp9/common/vp9_modecont.c index 64ff377c38a703cc227315b015d0e3d707a762b4..f7f2b901322abb2842b9e83da07764b5eb51948b 100644 --- a/vp9/common/vp9_modecont.c +++ b/vp9/common/vp9_modecont.c @@ -20,12 +20,3 @@ const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4] = { {14, 122, 22, 164}, // strong nz candidate(s), split {16, 70, 9, 183}, // weak nz candidate(s), split }; -const int vp9_default_mode_contexts_a[INTER_MODE_CONTEXTS][4] = { - {204, 1, 1, 213}, // 0,0 best: Only candidate - {106, 139, 22, 203}, // 0,0 best: non zero candidates - {75, 52, 15, 118}, // 0,0 best: non zero candidates, split - {12, 148, 61, 211}, // strong nz candidate(s), no split - {18, 98, 17, 199}, // weak nz candidate(s), no split - {11, 91, 25, 148}, // strong nz candidate(s), split - {10, 53, 9, 145}, // weak nz candidate(s), split -}; diff --git a/vp9/common/vp9_modecont.h b/vp9/common/vp9_modecont.h index 1fa4558e1b2b728e7baf3c208e8d67d5fd8a2c67..b142bd0f3269d1b1c3c79920c04739fe3bf670df 100644 --- a/vp9/common/vp9_modecont.h +++ b/vp9/common/vp9_modecont.h @@ -13,5 +13,4 @@ #define __INC_MODECONT_H extern const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4]; -extern const int vp9_default_mode_contexts_a[INTER_MODE_CONTEXTS][4]; #endif diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index d253f30baf7880e9cd0ffb928e6c0b1f90be3031..12865bfbb4775b72e6f4a21e286f96b663cab241 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -863,17 +863,9 @@ static void init_frame(VP9D_COMP *pbi) { pc->ref_frame_sign_bias[ALTREF_FRAME] = 0; vp9_init_mode_contexts(&pbi->common); - vpx_memcpy(pbi->common.fc.vp9_mode_contexts, - vp9_default_mode_contexts, - sizeof(vp9_default_mode_contexts)); - vpx_memcpy(&pc->lfc, &pc->fc, sizeof(pc->fc)); vpx_memcpy(&pc->lfc_a, &pc->fc, sizeof(pc->fc)); - vpx_memcpy(pbi->common.lfc.vp9_mode_contexts, - vp9_default_mode_contexts_a, - sizeof(vp9_default_mode_contexts_a)); - vpx_memset(pc->prev_mip, 0, (pc->mb_cols + 1) * (pc->mb_rows + 1)* sizeof(MODE_INFO)); vpx_memset(pc->mip, 0, diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 1d72485474f26b491f67127ad7978f3fdbadad24..b589243e8207398f2bd03d60a999bd12bc638b28 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -261,16 +261,9 @@ void vp9_setup_key_frame(VP9_COMP *cpi) { cpi->common.refresh_alt_ref_frame = TRUE; vp9_init_mode_contexts(&cpi->common); - vpx_memcpy(cpi->common.fc.vp9_mode_contexts, - vp9_default_mode_contexts, - sizeof(vp9_default_mode_contexts)); vpx_memcpy(&cpi->common.lfc, &cpi->common.fc, sizeof(cpi->common.fc)); vpx_memcpy(&cpi->common.lfc_a, &cpi->common.fc, sizeof(cpi->common.fc)); - vpx_memcpy(cpi->common.lfc.vp9_mode_contexts, - vp9_default_mode_contexts_a, - sizeof(vp9_default_mode_contexts_a)); - vpx_memset(cm->prev_mip, 0, (cm->mb_cols + 1) * (cm->mb_rows + 1)* sizeof(MODE_INFO)); vpx_memset(cm->mip, 0,