shithub: libvpx

Download patch

ref: 84d2298828d668f843032834fbb42a476fa2596f
parent: c6b9039fd94aede59ac1086a379955137fc8e1b8
author: Ronald S. Bultje <rbultje@google.com>
date: Mon Jul 16 12:46:46 EDT 2012 

Don't auto-default to comp-pred unless content is static.

Although it can be useful, in some cases it causes artifacts in motion-
based content.

Change-Id: I27bb80901020c40636e2018a8217759175a23f5b


--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1318,15 +1318,13 @@
     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][0] &&
              cpi->rd_prediction_type_threshes[frame_type][1] >
-             cpi->rd_prediction_type_threshes[frame_type][2] &&
-             check_dual_ref_flags(cpi))
+                 cpi->rd_prediction_type_threshes[frame_type][2] &&
+             check_dual_ref_flags(cpi) && cpi->static_mb_pct == 100)
       pred_type = COMP_PREDICTION_ONLY;
     else if (cpi->rd_prediction_type_threshes[frame_type][0] >
-             cpi->rd_prediction_type_threshes[frame_type][1] &&
-             cpi->rd_prediction_type_threshes[frame_type][0] >
-             cpi->rd_prediction_type_threshes[frame_type][2])
+                 cpi->rd_prediction_type_threshes[frame_type][2])
       pred_type = SINGLE_PREDICTION_ONLY;
     else
       pred_type = HYBRID_PREDICTION;