Skip to content

GitLab

Commit 5cf8a327 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by On2 (Google) Code Review
Browse files
Options

Merge "Don't use compound prediction for golden frames based on alt-ref frames." into experimental

parents f7c0b315 959b296a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
vp8/encoder/encodeframe.c
View file @ 5cf8a327
......@@ -1288,11 +1288,13 @@ void vp8_encode_frame(VP8_COMP *cpi)
else
frame_type = 2;
if (cpi->rd_prediction_type_threshes[frame_type][1] >
cpi->rd_prediction_type_threshes[frame_type][0] &&
cpi->rd_prediction_type_threshes[frame_type][1] >
cpi->rd_prediction_type_threshes[frame_type][2] &&
check_dual_ref_flags(cpi))
if (frame_type == 3)
pred_type = SINGLE_PREDICTION_ONLY;
else if (cpi->rd_prediction_type_threshes[frame_type][1] >
cpi->rd_prediction_type_threshes[frame_type][0] &&
cpi->rd_prediction_type_threshes[frame_type][1] >
cpi->rd_prediction_type_threshes[frame_type][2] &&
check_dual_ref_flags(cpi))
pred_type = COMP_PREDICTION_ONLY;
else if (cpi->rd_prediction_type_threshes[frame_type][0] >
cpi->rd_prediction_type_threshes[frame_type][1] &&
......
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