Remove remaining references to USE_TPL_CLASSICAL_MODEL
Change-Id: Iaaba24915c8a906c74d2648fd571ed5794a0411b
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 069d101..eaa586d 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -27,8 +27,6 @@
extern "C" {
#endif
-// 1: use classic model 0: use count or saving stats
-#define USE_TPL_CLASSIC_MODEL 0
#define MC_FLOW_BSIZE_1D 16
#define MC_FLOW_NUM_PELS (MC_FLOW_BSIZE_1D * MC_FLOW_BSIZE_1D)
#define MAX_MC_FLOW_BLK_IN_SB (MAX_SB_SIZE / MC_FLOW_BSIZE_1D)
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index be62065..916fb2a 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3909,9 +3909,7 @@
if (cpi->gf_group.index >= MAX_LAG_BUFFERS) return orig_rdmult;
-#if !USE_TPL_CLASSIC_MODEL
int64_t mc_count = 0, mc_saved = 0;
-#endif // !USE_TPL_CLASSIC_MODEL
int mi_count = 0;
const int mi_col_sr =
coded_to_superres_mi(mi_col, cm->superres_scale_denominator);
@@ -3929,10 +3927,8 @@
this_stats->mc_dep_dist);
intra_cost += this_stats->recrf_dist << RDDIV_BITS;
mc_dep_cost += (this_stats->recrf_dist << RDDIV_BITS) + mc_dep_delta;
-#if !USE_TPL_CLASSIC_MODEL
mc_count += this_stats->mc_count;
mc_saved += this_stats->mc_saved;
-#endif // !USE_TPL_CLASSIC_MODEL
mi_count++;
}
}
@@ -3946,7 +3942,6 @@
const double rk = (double)intra_cost / mc_dep_cost;
beta = (r0 / rk);
}
-#if !USE_TPL_CLASSIC_MODEL
} else if (analysis_type == 1) {
const double mc_count_base = (mi_count * cpi->rd.mc_count_base);
beta = (mc_count + 1.0) / (mc_count_base + 1.0);
@@ -3955,7 +3950,6 @@
const double mc_saved_base = (mi_count * cpi->rd.mc_saved_base);
beta = (mc_saved + 1.0) / (mc_saved_base + 1.0);
beta = pow(beta, 0.5);
-#endif // !USE_TPL_CLASSIC_MODEL
}
int rdmult = av1_get_adaptive_rdmult(cpi, beta);
@@ -4048,9 +4042,7 @@
if (cpi->gf_group.index >= MAX_LAG_BUFFERS) return base_qindex;
-#if !USE_TPL_CLASSIC_MODEL
int64_t mc_count = 0, mc_saved = 0;
-#endif // !USE_TPL_CLASSIC_MODEL
int mi_count = 0;
const int mi_col_sr =
coded_to_superres_mi(mi_col, cm->superres_scale_denominator);
@@ -4068,10 +4060,8 @@
this_stats->mc_dep_dist);
intra_cost += this_stats->recrf_dist << RDDIV_BITS;
mc_dep_cost += (this_stats->recrf_dist << RDDIV_BITS) + mc_dep_delta;
-#if !USE_TPL_CLASSIC_MODEL
mc_count += this_stats->mc_count;
mc_saved += this_stats->mc_saved;
-#endif // !USE_TPL_CLASSIC_MODEL
mi_count++;
}
}
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index e67b8ca..44ce442 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4111,10 +4111,8 @@
int tpl_stride = tpl_frame->stride;
int64_t intra_cost_base = 0;
int64_t mc_dep_cost_base = 0;
-#if !USE_TPL_CLASSIC_MODEL
int64_t mc_saved_base = 0;
int64_t mc_count_base = 0;
-#endif // !USE_TPL_CLASSIC_MODEL
const int step = 1 << cpi->tpl_stats_block_mis_log2;
const int mi_cols_sr = av1_pixels_to_mi(cm->superres_upscaled_width);
@@ -4128,10 +4126,8 @@
intra_cost_base += (this_stats->recrf_dist << RDDIV_BITS);
mc_dep_cost_base +=
(this_stats->recrf_dist << RDDIV_BITS) + mc_dep_delta;
-#if !USE_TPL_CLASSIC_MODEL
mc_count_base += this_stats->mc_count;
mc_saved_base += this_stats->mc_saved;
-#endif // !USE_TPL_CLASSIC_MODEL
}
}
@@ -4177,12 +4173,10 @@
}
}
}
-#if !USE_TPL_CLASSIC_MODEL
cpi->rd.mc_count_base = (double)mc_count_base /
(cm->mi_params.mi_rows * cm->mi_params.mi_cols);
cpi->rd.mc_saved_base = (double)mc_saved_base /
(cm->mi_params.mi_rows * cm->mi_params.mi_cols);
-#endif // !USE_TPL_CLASSIC_MODEL
aom_clear_system_state();
}
}
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 452fcca..cfe54c1 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -165,10 +165,8 @@
int_mv mv[INTER_REFS_PER_FRAME];
int ref_frame_index;
int64_t pred_error[INTER_REFS_PER_FRAME];
-#if !USE_TPL_CLASSIC_MODEL
int64_t mc_count;
int64_t mc_saved;
-#endif // !USE_TPL_CLASSIC_MODEL
} TplDepStats;
typedef struct TplDepFrame {
diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index cac8c5b..34fbe9b 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -79,9 +79,7 @@
int RDMULT;
double r0, arf_r0;
-#if !USE_TPL_CLASSIC_MODEL
double mc_saved_base, mc_count_base;
-#endif // !USE_TPL_CLASSIC_MODEL
} RD_OPT;
static INLINE void av1_init_rd_stats(RD_STATS *rd_stats) {
