vp10: don't allow comp_inter_inter on keyframes.

Ronald S. Bultje committed 11 years ago

Commit 6a032501 parent 558d93f2 files · +4 −0Browse files

Unified · Split

2 files

vp10/decoder/decodeframe.c +2 −0
vp10/encoder/encodeframe.c +2 −0

vp10/decoder/decodeframe.c+2−0

@@ -47,6 +47,8 @@ · 46 unmodified lines
47		47
48	static int is_compound_reference_allowed(const VP10_COMMON *cm) {	48	static int is_compound_reference_allowed(const VP10_COMMON *cm) {
49	int i;	49	int i;
		50	if (frame_is_intra_only(cm))
		51	return 0;
50	for (i = 1; i < REFS_PER_FRAME; ++i)	52	for (i = 1; i < REFS_PER_FRAME; ++i)
51	if (cm->ref_frame_sign_bias[i + 1] != cm->ref_frame_sign_bias[1])	53	if (cm->ref_frame_sign_bias[i + 1] != cm->ref_frame_sign_bias[1])
52	return 1;	54	return 1;

vp10/encoder/encodeframe.c+2−0

@@ -2807,6 +2807,8 @@ void vp10_encode_frame(VP10_COMP *cpi) { · 2806 unmodified lines
2807	cm->comp_var_ref[0] = LAST_FRAME;	2807	cm->comp_var_ref[0] = LAST_FRAME;
2808	cm->comp_var_ref[1] = GOLDEN_FRAME;	2808	cm->comp_var_ref[1] = GOLDEN_FRAME;
2809	}	2809	}
		2810	} else {
		2811	cpi->allow_comp_inter_inter = 0;
2810	}	2812	}
2811		2813
2812	if (cpi->sf.frame_parameter_update) {	2814	if (cpi->sf.frame_parameter_update) {