shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_ethread: allocate frame contexts outside VP9_COMMON struct"

--- a/vp9/common/vp9_entropy.c

+++ b/vp9/common/vp9_entropy.c

@@ -748,10 +748,10 @@

 }

 void vp9_default_coef_probs(VP9_COMMON *cm) {

-  vp9_copy(cm->fc.coef_probs[TX_4X4], default_coef_probs_4x4);

-  vp9_copy(cm->fc.coef_probs[TX_8X8], default_coef_probs_8x8);

-  vp9_copy(cm->fc.coef_probs[TX_16X16], default_coef_probs_16x16);

-  vp9_copy(cm->fc.coef_probs[TX_32X32], default_coef_probs_32x32);

+  vp9_copy(cm->fc->coef_probs[TX_4X4], default_coef_probs_4x4);

+  vp9_copy(cm->fc->coef_probs[TX_8X8], default_coef_probs_8x8);

+  vp9_copy(cm->fc->coef_probs[TX_16X16], default_coef_probs_16x16);

+  vp9_copy(cm->fc->coef_probs[TX_32X32], default_coef_probs_32x32);

 }

 #define COEF_COUNT_SAT 24

@@ -765,7 +765,7 @@

                              unsigned int count_sat,

                              unsigned int update_factor) {

   const FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];

-  vp9_coeff_probs_model *const probs = cm->fc.coef_probs[tx_size];

+  vp9_coeff_probs_model *const probs = cm->fc->coef_probs[tx_size];

   const vp9_coeff_probs_model *const pre_probs = pre_fc->coef_probs[tx_size];

   vp9_coeff_count_model *counts = cm->counts.coef[tx_size];

   unsigned int (*eob_counts)[REF_TYPES][COEF_BANDS][COEFF_CONTEXTS] =

--- a/vp9/common/vp9_entropymode.c

+++ b/vp9/common/vp9_entropymode.c

@@ -350,7 +350,7 @@

 void vp9_adapt_mode_probs(VP9_COMMON *cm) {

   int i, j;

-  FRAME_CONTEXT *fc = &cm->fc;

+  FRAME_CONTEXT *fc = cm->fc;

   const FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];

   const FRAME_COUNTS *counts = &cm->counts;

@@ -451,7 +451,7 @@

   lf->last_sharpness_level = -1;

   vp9_default_coef_probs(cm);

-  vp9_init_mode_probs(&cm->fc);

+  vp9_init_mode_probs(cm->fc);

   vp9_init_mv_probs(cm);

   if (cm->frame_type == KEY_FRAME ||

@@ -458,10 +458,10 @@

       cm->error_resilient_mode || cm->reset_frame_context == 3) {

     // Reset all frame contexts.

     for (i = 0; i < FRAME_CONTEXTS; ++i)

-      cm->frame_contexts[i] = cm->fc;

+      cm->frame_contexts[i] = *cm->fc;

   } else if (cm->reset_frame_context == 2) {

     // Reset only the frame context specified in the frame header.

-    cm->frame_contexts[cm->frame_context_idx] = cm->fc;

+    cm->frame_contexts[cm->frame_context_idx] = *cm->fc;

   }

   if (frame_is_intra_only(cm))

--- a/vp9/common/vp9_entropymv.c

+++ b/vp9/common/vp9_entropymv.c

@@ -196,7 +196,7 @@

 void vp9_adapt_mv_probs(VP9_COMMON *cm, int allow_hp) {

   int i, j;

-  nmv_context *fc = &cm->fc.nmvc;

+  nmv_context *fc = &cm->fc->nmvc;

   const nmv_context *pre_fc = &cm->frame_contexts[cm->frame_context_idx].nmvc;

   const nmv_context_counts *counts = &cm->counts.mv;

@@ -229,5 +229,5 @@

 }

 void vp9_init_mv_probs(VP9_COMMON *cm) {

-  cm->fc.nmvc = default_nmv_context;

+  cm->fc->nmvc = default_nmv_context;

 }

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -169,8 +169,8 @@

   MV_REFERENCE_FRAME comp_var_ref[2];

   REFERENCE_MODE reference_mode;

-  FRAME_CONTEXT fc;  /* this frame entropy */

-  FRAME_CONTEXT frame_contexts[FRAME_CONTEXTS];

+  FRAME_CONTEXT *fc;  /* this frame entropy */

+  FRAME_CONTEXT *frame_contexts;   // FRAME_CONTEXTS

   unsigned int  frame_context_idx; /* Context to use/update */

   FRAME_COUNTS counts;

@@ -261,7 +261,7 @@

 static INLINE const vp9_prob* get_partition_probs(const VP9_COMMON *cm,

                                                   int ctx) {

   return frame_is_intra_only(cm) ? vp9_kf_partition_probs[ctx]

-                                 : cm->fc.partition_prob[ctx];

+                                 : cm->fc->partition_prob[ctx];

 }

 static INLINE void set_skip_context(MACROBLOCKD *xd, int mi_row, int mi_col) {

--- a/vp9/common/vp9_pred_common.h

+++ b/vp9/common/vp9_pred_common.h

@@ -54,7 +54,7 @@

 static INLINE vp9_prob vp9_get_skip_prob(const VP9_COMMON *cm,

                                          const MACROBLOCKD *xd) {

-  return cm->fc.skip_probs[vp9_get_skip_context(xd)];

+  return cm->fc->skip_probs[vp9_get_skip_context(xd)];

 }

 int vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd);

@@ -63,7 +63,7 @@

 static INLINE vp9_prob vp9_get_intra_inter_prob(const VP9_COMMON *cm,

                                                 const MACROBLOCKD *xd) {

-  return cm->fc.intra_inter_prob[vp9_get_intra_inter_context(xd)];

+  return cm->fc->intra_inter_prob[vp9_get_intra_inter_context(xd)];

 }

 int vp9_get_reference_mode_context(const VP9_COMMON *cm, const MACROBLOCKD *xd);

@@ -70,7 +70,7 @@

 static INLINE vp9_prob vp9_get_reference_mode_prob(const VP9_COMMON *cm,

                                                    const MACROBLOCKD *xd) {

-  return cm->fc.comp_inter_prob[vp9_get_reference_mode_context(cm, xd)];

+  return cm->fc->comp_inter_prob[vp9_get_reference_mode_context(cm, xd)];

 }

 int vp9_get_pred_context_comp_ref_p(const VP9_COMMON *cm,

@@ -79,7 +79,7 @@

 static INLINE vp9_prob vp9_get_pred_prob_comp_ref_p(const VP9_COMMON *cm,

                                                     const MACROBLOCKD *xd) {

   const int pred_context = vp9_get_pred_context_comp_ref_p(cm, xd);

-  return cm->fc.comp_ref_prob[pred_context];

+  return cm->fc->comp_ref_prob[pred_context];

 }

 int vp9_get_pred_context_single_ref_p1(const MACROBLOCKD *xd);

@@ -86,7 +86,7 @@

 static INLINE vp9_prob vp9_get_pred_prob_single_ref_p1(const VP9_COMMON *cm,

                                                        const MACROBLOCKD *xd) {

-  return cm->fc.single_ref_prob[vp9_get_pred_context_single_ref_p1(xd)][0];

+  return cm->fc->single_ref_prob[vp9_get_pred_context_single_ref_p1(xd)][0];

 }

 int vp9_get_pred_context_single_ref_p2(const MACROBLOCKD *xd);

@@ -93,7 +93,7 @@

 static INLINE vp9_prob vp9_get_pred_prob_single_ref_p2(const VP9_COMMON *cm,

                                                        const MACROBLOCKD *xd) {

-  return cm->fc.single_ref_prob[vp9_get_pred_context_single_ref_p2(xd)][1];

+  return cm->fc->single_ref_prob[vp9_get_pred_context_single_ref_p2(xd)][1];

 }

 int vp9_get_tx_size_context(const MACROBLOCKD *xd);

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -127,7 +127,7 @@

 }

 static void read_frame_reference_mode_probs(VP9_COMMON *cm, vp9_reader *r) {

-  FRAME_CONTEXT *const fc = &cm->fc;

+  FRAME_CONTEXT *const fc = cm->fc;

   int i;

   if (cm->reference_mode == REFERENCE_MODE_SELECT)

@@ -1386,7 +1386,7 @@

                                   size_t partition_size) {

   VP9_COMMON *const cm = &pbi->common;

   MACROBLOCKD *const xd = &pbi->mb;

-  FRAME_CONTEXT *const fc = &cm->fc;

+  FRAME_CONTEXT *const fc = cm->fc;

   vp9_reader r;

   int k;

@@ -1540,7 +1540,7 @@

   setup_plane_dequants(cm, xd, cm->base_qindex);

   vp9_setup_block_planes(xd, cm->subsampling_x, cm->subsampling_y);

-  cm->fc = cm->frame_contexts[cm->frame_context_idx];

+  *cm->fc = cm->frame_contexts[cm->frame_context_idx];

   vp9_zero(cm->counts);

   vp9_zero(xd->dqcoeff);

@@ -1580,5 +1580,5 @@

   }

   if (cm->refresh_frame_context)

-    cm->frame_contexts[cm->frame_context_idx] = cm->fc;

+    cm->frame_contexts[cm->frame_context_idx] = *cm->fc;

 }

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -30,7 +30,7 @@

 static PREDICTION_MODE read_intra_mode_y(VP9_COMMON *cm, vp9_reader *r,

                                             int size_group) {

   const PREDICTION_MODE y_mode =

-      read_intra_mode(r, cm->fc.y_mode_prob[size_group]);

+      read_intra_mode(r, cm->fc->y_mode_prob[size_group]);

   if (!cm->frame_parallel_decoding_mode)

     ++cm->counts.y_mode[size_group][y_mode];

   return y_mode;

@@ -39,7 +39,7 @@

 static PREDICTION_MODE read_intra_mode_uv(VP9_COMMON *cm, vp9_reader *r,

                                           PREDICTION_MODE y_mode) {

   const PREDICTION_MODE uv_mode = read_intra_mode(r,

-                                         cm->fc.uv_mode_prob[y_mode]);

+                                         cm->fc->uv_mode_prob[y_mode]);

   if (!cm->frame_parallel_decoding_mode)

     ++cm->counts.uv_mode[y_mode][uv_mode];

   return uv_mode;

@@ -47,7 +47,7 @@

 static PREDICTION_MODE read_inter_mode(VP9_COMMON *cm, vp9_reader *r, int ctx) {

   const int mode = vp9_read_tree(r, vp9_inter_mode_tree,

-                                 cm->fc.inter_mode_probs[ctx]);

+                                 cm->fc->inter_mode_probs[ctx]);

   if (!cm->frame_parallel_decoding_mode)

     ++cm->counts.inter_mode[ctx][mode];

@@ -61,7 +61,7 @@

 static TX_SIZE read_selected_tx_size(VP9_COMMON *cm, MACROBLOCKD *xd,

                                      TX_SIZE max_tx_size, vp9_reader *r) {

   const int ctx = vp9_get_tx_size_context(xd);

-  const vp9_prob *tx_probs = get_tx_probs(max_tx_size, ctx, &cm->fc.tx_probs);

+  const vp9_prob *tx_probs = get_tx_probs(max_tx_size, ctx, &cm->fc->tx_probs);

   int tx_size = vp9_read(r, tx_probs[0]);

   if (tx_size != TX_4X4 && max_tx_size >= TX_16X16) {

     tx_size += vp9_read(r, tx_probs[1]);

@@ -150,7 +150,7 @@

     return 1;

   } else {

     const int ctx = vp9_get_skip_context(xd);

-    const int skip = vp9_read(r, cm->fc.skip_probs[ctx]);

+    const int skip = vp9_read(r, cm->fc->skip_probs[ctx]);

     if (!cm->frame_parallel_decoding_mode)

       ++cm->counts.skip[ctx][skip];

     return skip;

@@ -258,7 +258,7 @@

   if (cm->reference_mode == REFERENCE_MODE_SELECT) {

     const int ctx = vp9_get_reference_mode_context(cm, xd);

     const REFERENCE_MODE mode =

-        (REFERENCE_MODE)vp9_read(r, cm->fc.comp_inter_prob[ctx]);

+        (REFERENCE_MODE)vp9_read(r, cm->fc->comp_inter_prob[ctx]);

     if (!cm->frame_parallel_decoding_mode)

       ++cm->counts.comp_inter[ctx][mode];

     return mode;  // SINGLE_REFERENCE or COMPOUND_REFERENCE

@@ -271,7 +271,7 @@

 static void read_ref_frames(VP9_COMMON *const cm, MACROBLOCKD *const xd,

                             vp9_reader *r,

                             int segment_id, MV_REFERENCE_FRAME ref_frame[2]) {

-  FRAME_CONTEXT *const fc = &cm->fc;

+  FRAME_CONTEXT *const fc = cm->fc;

   FRAME_COUNTS *const counts = &cm->counts;

   if (vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {

@@ -317,7 +317,7 @@

   const int ctx = vp9_get_pred_context_switchable_interp(xd);

   const INTERP_FILTER type =

       (INTERP_FILTER)vp9_read_tree(r, vp9_switchable_interp_tree,

-                                   cm->fc.switchable_interp_prob[ctx]);

+                                   cm->fc->switchable_interp_prob[ctx]);

   if (!cm->frame_parallel_decoding_mode)

     ++cm->counts.switchable_interp[ctx][type];

   return type;

@@ -372,7 +372,7 @@

       nmv_context_counts *const mv_counts = cm->frame_parallel_decoding_mode ?

                                             NULL : &cm->counts.mv;

       for (i = 0; i < 1 + is_compound; ++i) {

-        read_mv(r, &mv[i].as_mv, &ref_mv[i].as_mv, &cm->fc.nmvc, mv_counts,

+        read_mv(r, &mv[i].as_mv, &ref_mv[i].as_mv, &cm->fc->nmvc, mv_counts,

                 allow_hp);

         ret = ret && is_mv_valid(&mv[i].as_mv);

       }

@@ -410,7 +410,7 @@

            INTRA_FRAME;

   } else {

     const int ctx = vp9_get_intra_inter_context(xd);

-    const int is_inter = vp9_read(r, cm->fc.intra_inter_prob[ctx]);

+    const int is_inter = vp9_read(r, cm->fc->intra_inter_prob[ctx]);

     if (!cm->frame_parallel_decoding_mode)

       ++cm->counts.intra_inter[ctx][is_inter];

     return is_inter;

--- a/vp9/decoder/vp9_decoder.c

+++ b/vp9/decoder/vp9_decoder.c

@@ -59,6 +59,13 @@

   }

   cm->error.setjmp = 1;

+

+  CHECK_MEM_ERROR(cm, cm->fc,

+                  (FRAME_CONTEXT *)vpx_calloc(1, sizeof(*cm->fc)));

+  CHECK_MEM_ERROR(cm, cm->frame_contexts,

+                  (FRAME_CONTEXT *)vpx_calloc(FRAME_CONTEXTS,

+                  sizeof(*cm->frame_contexts)));

+

   pbi->need_resync = 1;

   initialize_dec();

@@ -87,6 +94,11 @@

 void vp9_decoder_remove(VP9Decoder *pbi) {

   VP9_COMMON *const cm = &pbi->common;

   int i;

+

+  vpx_free(cm->fc);

+  cm->fc = NULL;

+  vpx_free(cm->frame_contexts);

+  cm->frame_contexts = NULL;

   vp9_get_worker_interface()->end(&pbi->lf_worker);

   vpx_free(pbi->lf_worker.data1);

--- a/vp9/decoder/vp9_detokenize.c

+++ b/vp9/decoder/vp9_detokenize.c

@@ -58,7 +58,7 @@

                         int ctx, const int16_t *scan, const int16_t *nb,

                         vp9_reader *r) {

   const int max_eob = 16 << (tx_size << 1);

-  const FRAME_CONTEXT *const fc = &cm->fc;

+  const FRAME_CONTEXT *const fc = cm->fc;

   FRAME_COUNTS *const counts = &cm->counts;

   const int ref = is_inter_block(&xd->mi[0].src_mi->mbmi);

   int band, c = 0;

--- a/vp9/encoder/vp9_bitstream.c

+++ b/vp9/encoder/vp9_bitstream.c

@@ -84,7 +84,7 @@

                                    vp9_writer *w) {

   const TX_SIZE max_tx_size = max_txsize_lookup[bsize];

   const vp9_prob *const tx_probs = get_tx_probs2(max_tx_size, xd,

-                                                 &cm->fc.tx_probs);

+                                                 &cm->fc->tx_probs);

   vp9_write(w, tx_size != TX_4X4, tx_probs[0]);

   if (tx_size != TX_4X4 && max_tx_size >= TX_16X16) {

     vp9_write(w, tx_size != TX_8X8, tx_probs[1]);

@@ -108,7 +108,7 @@

   int k;

   for (k = 0; k < SKIP_CONTEXTS; ++k)

-    vp9_cond_prob_diff_update(w, &cm->fc.skip_probs[k], cm->counts.skip[k]);

+    vp9_cond_prob_diff_update(w, &cm->fc->skip_probs[k], cm->counts.skip[k]);

 }

 static void update_switchable_interp_probs(VP9_COMMON *cm, vp9_writer *w) {

@@ -115,7 +115,7 @@

   int j;

   for (j = 0; j < SWITCHABLE_FILTER_CONTEXTS; ++j)

     prob_diff_update(vp9_switchable_interp_tree,

-                     cm->fc.switchable_interp_prob[j],

+                     cm->fc->switchable_interp_prob[j],

                      cm->counts.switchable_interp[j], SWITCHABLE_FILTERS, w);

 }

@@ -237,7 +237,7 @@

 static void pack_inter_mode_mvs(VP9_COMP *cpi, const MODE_INFO *mi,

                                 vp9_writer *w) {

   VP9_COMMON *const cm = &cpi->common;

-  const nmv_context *nmvc = &cm->fc.nmvc;

+  const nmv_context *nmvc = &cm->fc->nmvc;

   const MACROBLOCK *const x = &cpi->mb;

   const MACROBLOCKD *const xd = &x->e_mbd;

   const struct segmentation *const seg = &cm->seg;

@@ -275,7 +275,7 @@

   if (!is_inter) {

     if (bsize >= BLOCK_8X8) {

-      write_intra_mode(w, mode, cm->fc.y_mode_prob[size_group_lookup[bsize]]);

+      write_intra_mode(w, mode, cm->fc->y_mode_prob[size_group_lookup[bsize]]);

     } else {

       int idx, idy;

       const int num_4x4_w = num_4x4_blocks_wide_lookup[bsize];

@@ -283,14 +283,14 @@

       for (idy = 0; idy < 2; idy += num_4x4_h) {

         for (idx = 0; idx < 2; idx += num_4x4_w) {

           const PREDICTION_MODE b_mode = mi->bmi[idy * 2 + idx].as_mode;

-          write_intra_mode(w, b_mode, cm->fc.y_mode_prob[0]);

+          write_intra_mode(w, b_mode, cm->fc->y_mode_prob[0]);

         }

       }

     }

-    write_intra_mode(w, mbmi->uv_mode, cm->fc.uv_mode_prob[mode]);

+    write_intra_mode(w, mbmi->uv_mode, cm->fc->uv_mode_prob[mode]);

   } else {

     const int mode_ctx = mbmi->mode_context[mbmi->ref_frame[0]];

-    const vp9_prob *const inter_probs = cm->fc.inter_mode_probs[mode_ctx];

+    const vp9_prob *const inter_probs = cm->fc->inter_mode_probs[mode_ctx];

     write_ref_frames(cm, xd, w);

     // If segment skip is not enabled code the mode.

@@ -304,7 +304,7 @@

     if (cm->interp_filter == SWITCHABLE) {

       const int ctx = vp9_get_pred_context_switchable_interp(xd);

       vp9_write_token(w, vp9_switchable_interp_tree,

-                      cm->fc.switchable_interp_prob[ctx],

+                      cm->fc->switchable_interp_prob[ctx],

                       &switchable_interp_encodings[mbmi->interp_filter]);

       ++cpi->interp_filter_selected[0][mbmi->interp_filter];

     } else {

@@ -528,7 +528,7 @@

                                      TX_SIZE tx_size,

                                      vp9_coeff_stats *frame_branch_ct,

                                      vp9_coeff_probs_model *new_coef_probs) {

-  vp9_coeff_probs_model *old_coef_probs = cpi->common.fc.coef_probs[tx_size];

+  vp9_coeff_probs_model *old_coef_probs = cpi->common.fc->coef_probs[tx_size];

   const vp9_prob upd = DIFF_UPDATE_PROB;

   const int entropy_nodes_update = UNCONSTRAINED_NODES;

   int i, j, k, l, t;

@@ -830,13 +830,13 @@

     for (i = 0; i < TX_SIZE_CONTEXTS; i++) {

       tx_counts_to_branch_counts_8x8(cm->counts.tx.p8x8[i], ct_8x8p);

       for (j = 0; j < TX_SIZES - 3; j++)

-        vp9_cond_prob_diff_update(w, &cm->fc.tx_probs.p8x8[i][j], ct_8x8p[j]);

+        vp9_cond_prob_diff_update(w, &cm->fc->tx_probs.p8x8[i][j], ct_8x8p[j]);

     }

     for (i = 0; i < TX_SIZE_CONTEXTS; i++) {

       tx_counts_to_branch_counts_16x16(cm->counts.tx.p16x16[i], ct_16x16p);

       for (j = 0; j < TX_SIZES - 2; j++)

-        vp9_cond_prob_diff_update(w, &cm->fc.tx_probs.p16x16[i][j],

+        vp9_cond_prob_diff_update(w, &cm->fc->tx_probs.p16x16[i][j],

                                   ct_16x16p[j]);

     }

@@ -843,7 +843,7 @@

     for (i = 0; i < TX_SIZE_CONTEXTS; i++) {

       tx_counts_to_branch_counts_32x32(cm->counts.tx.p32x32[i], ct_32x32p);

       for (j = 0; j < TX_SIZES - 1; j++)

-        vp9_cond_prob_diff_update(w, &cm->fc.tx_probs.p32x32[i][j],

+        vp9_cond_prob_diff_update(w, &cm->fc->tx_probs.p32x32[i][j],

                                   ct_32x32p[j]);

     }

   }

@@ -1161,7 +1161,7 @@

 static size_t write_compressed_header(VP9_COMP *cpi, uint8_t *data) {

   VP9_COMMON *const cm = &cpi->common;

   MACROBLOCKD *const xd = &cpi->mb.e_mbd;

-  FRAME_CONTEXT *const fc = &cm->fc;

+  FRAME_CONTEXT *const fc = cm->fc;

   vp9_writer header_bc;

   vp9_start_encode(&header_bc, data);

@@ -1178,7 +1178,7 @@

     int i;

     for (i = 0; i < INTER_MODE_CONTEXTS; ++i)

-      prob_diff_update(vp9_inter_mode_tree, cm->fc.inter_mode_probs[i],

+      prob_diff_update(vp9_inter_mode_tree, cm->fc->inter_mode_probs[i],

                        cm->counts.inter_mode[i], INTER_MODES, &header_bc);

     vp9_zero(cm->counts.inter_mode);

@@ -1219,7 +1219,7 @@

                                   cm->counts.comp_ref[i]);

     for (i = 0; i < BLOCK_SIZE_GROUPS; ++i)

-      prob_diff_update(vp9_intra_mode_tree, cm->fc.y_mode_prob[i],

+      prob_diff_update(vp9_intra_mode_tree, cm->fc->y_mode_prob[i],

                        cm->counts.y_mode[i], INTRA_MODES, &header_bc);

     for (i = 0; i < PARTITION_CONTEXTS; ++i)

--- a/vp9/encoder/vp9_encodemv.c

+++ b/vp9/encoder/vp9_encodemv.c

@@ -163,7 +163,7 @@

 void vp9_write_nmv_probs(VP9_COMMON *cm, int usehp, vp9_writer *w) {

   int i, j;

-  nmv_context *const mvc = &cm->fc.nmvc;

+  nmv_context *const mvc = &cm->fc->nmvc;

   nmv_context_counts *const counts = &cm->counts.mv;

   write_mv_update(vp9_mv_joint_tree, mvc->joints, counts->joints, MV_JOINTS, w);

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -134,7 +134,7 @@

     cpi->refresh_alt_ref_frame = 1;

     vp9_zero(cpi->interp_filter_selected);

   } else {

-    cm->fc = cm->frame_contexts[cm->frame_context_idx];

+    *cm->fc = cm->frame_contexts[cm->frame_context_idx];

     vp9_zero(cpi->interp_filter_selected[0]);

   }

 }

@@ -160,6 +160,11 @@

   VP9_COMMON *const cm = &cpi->common;

   int i;

+  vpx_free(cm->fc);

+  cm->fc = NULL;

+  vpx_free(cm->frame_contexts);

+  cm->frame_contexts = NULL;

+

   // Delete sementation map

   vpx_free(cpi->segmentation_map);

   cpi->segmentation_map = NULL;

@@ -257,7 +262,7 @@

   vp9_copy(cc->last_ref_lf_deltas, cm->lf.last_ref_deltas);

   vp9_copy(cc->last_mode_lf_deltas, cm->lf.last_mode_deltas);

-  cc->fc = cm->fc;

+  cc->fc = *cm->fc;

 }

 static void restore_coding_context(VP9_COMP *cpi) {

@@ -286,7 +291,7 @@

   vp9_copy(cm->lf.last_ref_deltas, cc->last_ref_lf_deltas);

   vp9_copy(cm->lf.last_mode_deltas, cc->last_mode_lf_deltas);

-  cm->fc = cc->fc;

+  *cm->fc = cc->fc;

 }

 static void configure_static_seg_features(VP9_COMP *cpi) {

@@ -1374,6 +1379,12 @@

   cm->error.setjmp = 1;

+  CHECK_MEM_ERROR(cm, cm->fc,

+                  (FRAME_CONTEXT *)vpx_calloc(1, sizeof(*cm->fc)));

+  CHECK_MEM_ERROR(cm, cm->frame_contexts,

+                  (FRAME_CONTEXT *)vpx_calloc(FRAME_CONTEXTS,

+                  sizeof(*cm->frame_contexts)));

+

   cpi->use_svc = 0;

   init_config(cpi, oxcf);

@@ -3638,7 +3649,7 @@

   }

   if (cm->refresh_frame_context)

-    cm->frame_contexts[cm->frame_context_idx] = cm->fc;

+    cm->frame_contexts[cm->frame_context_idx] = *cm->fc;

   // Frame was dropped, release scaled references.

   if (*size == 0) {

--- a/vp9/encoder/vp9_rd.c

+++ b/vp9/encoder/vp9_rd.c

@@ -65,7 +65,7 @@

 };

 static void fill_mode_costs(VP9_COMP *cpi) {

-  const FRAME_CONTEXT *const fc = &cpi->common.fc;

+  const FRAME_CONTEXT *const fc = cpi->common.fc;

   int i, j;

   for (i = 0; i < INTRA_MODES; ++i)

@@ -280,7 +280,7 @@

   set_block_thresholds(cm, rd);

   if (!cpi->sf.use_nonrd_pick_mode || cm->frame_type == KEY_FRAME) {

-    fill_token_costs(x->token_costs, cm->fc.coef_probs);

+    fill_token_costs(x->token_costs, cm->fc->coef_probs);

     for (i = 0; i < PARTITION_CONTEXTS; ++i)

       vp9_cost_tokens(cpi->partition_cost[i], get_partition_probs(cm, i),

@@ -295,11 +295,11 @@

       vp9_build_nmv_cost_table(x->nmvjointcost,

                                cm->allow_high_precision_mv ? x->nmvcost_hp

                                                            : x->nmvcost,

-                               &cm->fc.nmvc, cm->allow_high_precision_mv);

+                               &cm->fc->nmvc, cm->allow_high_precision_mv);

       for (i = 0; i < INTER_MODE_CONTEXTS; ++i)

         vp9_cost_tokens((int *)cpi->inter_mode_cost[i],

-                        cm->fc.inter_mode_probs[i], vp9_inter_mode_tree);

+                        cm->fc->inter_mode_probs[i], vp9_inter_mode_tree);

     }

   }

 }

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -639,7 +639,7 @@

   int64_t best_rd = INT64_MAX;

   TX_SIZE best_tx = max_tx_size;

-  const vp9_prob *tx_probs = get_tx_probs2(max_tx_size, xd, &cm->fc.tx_probs);

+  const vp9_prob *tx_probs = get_tx_probs2(max_tx_size, xd, &cm->fc->tx_probs);

   assert(skip_prob > 0);

   s0 = vp9_cost_bit(skip_prob, 0);

   s1 = vp9_cost_bit(skip_prob, 1);

--- a/vp9/encoder/vp9_tokenize.c

+++ b/vp9/encoder/vp9_tokenize.c

@@ -313,7 +313,7 @@

   unsigned int (*const counts)[COEFF_CONTEXTS][ENTROPY_TOKENS] =

       cpi->coef_counts[tx_size][type][ref];

   vp9_prob (*const coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =

-      cpi->common.fc.coef_probs[tx_size][type][ref];

+      cpi->common.fc->coef_probs[tx_size][type][ref];

   unsigned int (*const eob_branch)[COEFF_CONTEXTS] =

       cpi->common.counts.eob_branch[tx_size][type][ref];

   const uint8_t *const band = get_band_translate(tx_size);