From 11e23e673d4295964fa6558c8c81741002f62aaf Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Tue, 17 Jul 2012 22:34:07 -0700
Subject: [PATCH] cleanup experiments in configure
this commit removes a number of experiment options from configure
script. the associated experiments are already fully merged, the
options in configure script have no effect at all.
Change-Id: I8054ccaee0a04610162ed76ac9e59c4538217113
---
configure | 4 ----
vp8/encoder/encodeframe.c | 7 -------
vp8/encoder/onyx_if.c | 6 ------
vp8/encoder/rdopt.c | 3 ---
4 files changed, 20 deletions(-)
diff --git a/configure b/configure
index 5f39413f2f..c9b71c5a92 100755
--- a/configure
+++ b/configure
@@ -214,11 +214,7 @@ HAVE_LIST="
unistd_h
"
EXPERIMENT_LIST="
- t8x8
csm
- qimode
- uvintra
- compred
enhanced_interp
featureupdates
high_precision_mv
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index ee0ed29211..ef34dd33e2 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -854,13 +854,6 @@ static void encode_sb(VP8_COMP *cpi,
check_segref(xd, *segment_id, LAST_FRAME) +
check_segref(xd, *segment_id, GOLDEN_FRAME) +
check_segref(xd, *segment_id, ALTREF_FRAME)) > 1)) {
-// TODO this may not be a good idea as it makes sample size small and means
-// the predictor functions cannot use data about most likely value only most
-// likely unpredicted value.
-// #if CONFIG_COMPRED
-// // Only update count for incorrectly predicted cases
-// if ( !ref_pred_flag )
-// #endif
{
cpi->count_mb_ref_frame_usage
[xd->mode_info_context->mbmi.ref_frame]++;
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 3eb25d255f..7a9022a1d2 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3013,12 +3013,6 @@ static void encode_frame_to_data_rate
}
}
-// #if !CONFIG_COMPRED
- // This function has been deprecated for now but we may want to do
- // something here at a late date
- // update_rd_ref_frame_probs(cpi);
-// #endif
-
// Test code for new segment features
init_seg_features(cpi);
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 00732fdc73..2c04b54b1a 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -3748,9 +3748,6 @@ int vp8cx_pick_mode_inter_macroblock
int distortion;
int intra_error = 0;
unsigned char *segment_id = &xd->mode_info_context->mbmi.segment_id;
-#if CONFIG_COMPRED
- unsigned char ref_pred_flag;
-#endif
if (xd->segmentation_enabled)
x->encode_breakout = cpi->segment_encode_breakout[*segment_id];
--
GitLab