shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: move encoder-only member from common"

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

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

@@ -184,7 +184,6 @@

   struct segmentation seg;

   // Context probabilities for reference frame prediction

-  int allow_comp_inter_inter;

   MV_REFERENCE_FRAME comp_fixed_ref;

   MV_REFERENCE_FRAME comp_var_ref[2];

   REFERENCE_MODE reference_mode;

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

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

@@ -1183,7 +1183,7 @@

       vp9_cond_prob_diff_update(&header_bc, &fc->intra_inter_prob[i],

                                 counts->intra_inter[i]);

-    if (cm->allow_comp_inter_inter) {

+    if (cpi->allow_comp_inter_inter) {

       const int use_compound_pred = cm->reference_mode != SINGLE_REFERENCE;

       const int use_hybrid_pred = cm->reference_mode == REFERENCE_MODE_SELECT;

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -3714,9 +3714,9 @@

              cm->ref_frame_sign_bias[GOLDEN_FRAME]) ||

         (cm->ref_frame_sign_bias[ALTREF_FRAME] ==

              cm->ref_frame_sign_bias[LAST_FRAME])) {

-      cm->allow_comp_inter_inter = 0;

+      cpi->allow_comp_inter_inter = 0;

     } else {

-      cm->allow_comp_inter_inter = 1;

+      cpi->allow_comp_inter_inter = 1;

       cm->comp_fixed_ref = ALTREF_FRAME;

       cm->comp_var_ref[0] = LAST_FRAME;

       cm->comp_var_ref[1] = GOLDEN_FRAME;

@@ -3740,7 +3740,7 @@

     const int is_alt_ref = frame_type == ALTREF_FRAME;

     /* prediction (compound, single or hybrid) mode selection */

-    if (is_alt_ref || !cm->allow_comp_inter_inter)

+    if (is_alt_ref || !cpi->allow_comp_inter_inter)

       cm->reference_mode = SINGLE_REFERENCE;

     else if (mode_thrs[COMPOUND_REFERENCE] > mode_thrs[SINGLE_REFERENCE] &&

              mode_thrs[COMPOUND_REFERENCE] >

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -339,6 +339,8 @@

   unsigned int max_mv_magnitude;

   int mv_step_param;

+  int allow_comp_inter_inter;

+

   // Default value is 1. From first pass stats, encode_breakout may be disabled.

   ENCODE_BREAKOUT_TYPE allow_encode_breakout;

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

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

@@ -3065,7 +3065,7 @@

     comp_pred = second_ref_frame > INTRA_FRAME;

     if (comp_pred) {

-      if (!cm->allow_comp_inter_inter)

+      if (!cpi->allow_comp_inter_inter)

         continue;

       // Skip compound inter modes if ARF is not available.

@@ -3715,7 +3715,7 @@

     comp_pred = second_ref_frame > INTRA_FRAME;

     if (comp_pred) {

-      if (!cm->allow_comp_inter_inter)

+      if (!cpi->allow_comp_inter_inter)

         continue;

       if (!(cpi->ref_frame_flags & flag_list[second_ref_frame]))

         continue;