shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp10: don't allow comp_inter_inter on keyframes."

--- a/vp10/decoder/decodeframe.c

+++ b/vp10/decoder/decodeframe.c

@@ -47,6 +47,8 @@

 static int is_compound_reference_allowed(const VP10_COMMON *cm) {

   int i;

+  if (frame_is_intra_only(cm))

+    return 0;

   for (i = 1; i < REFS_PER_FRAME; ++i)

     if (cm->ref_frame_sign_bias[i + 1] != cm->ref_frame_sign_bias[1])

       return 1;

--- a/vp10/encoder/encodeframe.c

+++ b/vp10/encoder/encodeframe.c

@@ -2807,6 +2807,8 @@

       cm->comp_var_ref[0] = LAST_FRAME;

       cm->comp_var_ref[1] = GOLDEN_FRAME;

     }

+  } else {

+    cpi->allow_comp_inter_inter = 0;

   }

   if (cpi->sf.frame_parameter_update) {