Commit dbefcc06 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Gerrit Code Review

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

parents a8577282 6a032503
...@@ -47,6 +47,8 @@ ...@@ -47,6 +47,8 @@
static int is_compound_reference_allowed(const VP10_COMMON *cm) { static int is_compound_reference_allowed(const VP10_COMMON *cm) {
int i; int i;
if (frame_is_intra_only(cm))
return 0;
for (i = 1; i < REFS_PER_FRAME; ++i) for (i = 1; i < REFS_PER_FRAME; ++i)
if (cm->ref_frame_sign_bias[i + 1] != cm->ref_frame_sign_bias[1]) if (cm->ref_frame_sign_bias[i + 1] != cm->ref_frame_sign_bias[1])
return 1; return 1;
......
...@@ -2807,6 +2807,8 @@ void vp10_encode_frame(VP10_COMP *cpi) { ...@@ -2807,6 +2807,8 @@ void vp10_encode_frame(VP10_COMP *cpi) {
cm->comp_var_ref[0] = LAST_FRAME; cm->comp_var_ref[0] = LAST_FRAME;
cm->comp_var_ref[1] = GOLDEN_FRAME; cm->comp_var_ref[1] = GOLDEN_FRAME;
} }
} else {
cpi->allow_comp_inter_inter = 0;
} }
if (cpi->sf.frame_parameter_update) { if (cpi->sf.frame_parameter_update) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment