Merge "Adding const to several pointers."
This commit is contained in:
commit
5bcc11b17a
@ -657,10 +657,10 @@ void vp9_coef_tree_initialize() {
|
||||
static void adapt_coef_probs(VP9_COMMON *cm, TX_SIZE tx_size,
|
||||
unsigned int count_sat,
|
||||
unsigned int update_factor) {
|
||||
FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];
|
||||
const FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];
|
||||
|
||||
vp9_coeff_probs_model *dst_coef_probs = cm->fc.coef_probs[tx_size];
|
||||
vp9_coeff_probs_model *pre_coef_probs = pre_fc->coef_probs[tx_size];
|
||||
const vp9_coeff_probs_model *pre_coef_probs = pre_fc->coef_probs[tx_size];
|
||||
vp9_coeff_count_model *coef_counts = cm->counts.coef[tx_size];
|
||||
unsigned int (*eob_branch_count)[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS] =
|
||||
cm->counts.eob_branch[tx_size];
|
||||
|
@ -214,11 +214,11 @@ static unsigned int adapt_probs(unsigned int i,
|
||||
void vp9_adapt_mv_probs(VP9_COMMON *cm, int allow_hp) {
|
||||
int i, j;
|
||||
|
||||
FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];
|
||||
const FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];
|
||||
|
||||
nmv_context *ctx = &cm->fc.nmvc;
|
||||
nmv_context *pre_ctx = &pre_fc->nmvc;
|
||||
nmv_context_counts *cts = &cm->counts.mv;
|
||||
const nmv_context *pre_ctx = &pre_fc->nmvc;
|
||||
const nmv_context_counts *cts = &cm->counts.mv;
|
||||
|
||||
adapt_probs(0, vp9_mv_joint_tree, ctx->joints, pre_ctx->joints, cts->joints);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user