commit 6fd0929fb53ca5dee83ff99f34d987a88eefa1ea
author Yaowu Xu <yaowu@google.com> Wed Jul 18 10:53:57 2012 -0700
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Wed Jul 18 10:53:57 2012 -0700
tree b5f95e6802e6bb62bb43dc42bc04fd15e19031c8
parent df35f6b3f082a008bbcb687ea773bb513e18403a
parent d632bf8cf553e125c9112e921c5a51b7265a0277

Merge "removed floating point version 8x8 fdct" into experimental

vp8/encoder/encodeframe.c

diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index ef34dd3..c8ee52f 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1311,15 +1311,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;