Make adaptive_rd_thresh row-mt friendly
In row based multi-threading of encoder, adaptive_rd_thresh
is disabled by default. This CL will facilitate enabling this
speed feature for row-mt. The thresh_freq_fact is reset for
every row. Also, adaptive_rd_thresh is set to 1 for speed=3,4
for better trade-off between encoder speed and quality.
STATS_CHANGED
Change-Id: I57fac95f83372d9f3a8e18f1351f4cdbbbd0cfc0
diff --git a/av1/av1.cmake b/av1/av1.cmake
index d8a78ea..d0e6278 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -116,6 +116,7 @@
"${AOM_ROOT}/av1/encoder/aq_cyclicrefresh.h"
"${AOM_ROOT}/av1/encoder/aq_variance.c"
"${AOM_ROOT}/av1/encoder/aq_variance.h"
+ "${AOM_ROOT}/av1/encoder/enc_enums.h"
"${AOM_ROOT}/av1/encoder/av1_fwd_txfm1d.c"
"${AOM_ROOT}/av1/encoder/av1_fwd_txfm1d.h"
"${AOM_ROOT}/av1/encoder/av1_fwd_txfm1d_cfg.h"
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 2ea62d1..067ed15 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -16,6 +16,7 @@
#include "av1/common/entropy.h"
#include "av1/common/mvref_common.h"
+#include "av1/encoder/enc_enums.h"
#if !CONFIG_REALTIME_ONLY
#include "av1/encoder/partition_cnn_weights.h"
#endif
@@ -419,6 +420,7 @@
float cnn_buffer[CNN_OUT_BUF_SIZE];
float log_q;
#endif
+ int thresh_freq_fact[BLOCK_SIZES_ALL][MAX_MODES];
};
static INLINE int is_rect_tx_allowed_bsize(BLOCK_SIZE bsize) {
diff --git a/av1/encoder/enc_enums.h b/av1/encoder/enc_enums.h
new file mode 100644
index 0000000..d5c9744
--- /dev/null
+++ b/av1/encoder/enc_enums.h
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_ENCODER_ENC_ENUMS_H_
+#define AOM_AV1_ENCODER_ENC_ENUMS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// This enumerator type needs to be kept aligned with the mode order in
+// const MODE_DEFINITION av1_mode_order[MAX_MODES] used in the rd code.
+enum {
+ THR_NEARESTMV,
+ THR_NEARESTL2,
+ THR_NEARESTL3,
+ THR_NEARESTB,
+ THR_NEARESTA2,
+ THR_NEARESTA,
+ THR_NEARESTG,
+
+ THR_NEWMV,
+ THR_NEWL2,
+ THR_NEWL3,
+ THR_NEWB,
+ THR_NEWA2,
+ THR_NEWA,
+ THR_NEWG,
+
+ THR_NEARMV,
+ THR_NEARL2,
+ THR_NEARL3,
+ THR_NEARB,
+ THR_NEARA2,
+ THR_NEARA,
+ THR_NEARG,
+
+ THR_GLOBALMV,
+ THR_GLOBALL2,
+ THR_GLOBALL3,
+ THR_GLOBALB,
+ THR_GLOBALA2,
+ THR_GLOBALG,
+ THR_GLOBALA,
+
+ THR_COMP_NEAREST_NEARESTLA,
+ THR_COMP_NEAREST_NEARESTL2A,
+ THR_COMP_NEAREST_NEARESTL3A,
+ THR_COMP_NEAREST_NEARESTGA,
+ THR_COMP_NEAREST_NEARESTLB,
+ THR_COMP_NEAREST_NEARESTL2B,
+ THR_COMP_NEAREST_NEARESTL3B,
+ THR_COMP_NEAREST_NEARESTGB,
+ THR_COMP_NEAREST_NEARESTLA2,
+ THR_COMP_NEAREST_NEARESTL2A2,
+ THR_COMP_NEAREST_NEARESTL3A2,
+ THR_COMP_NEAREST_NEARESTGA2,
+ THR_COMP_NEAREST_NEARESTLL2,
+ THR_COMP_NEAREST_NEARESTLL3,
+ THR_COMP_NEAREST_NEARESTLG,
+ THR_COMP_NEAREST_NEARESTBA,
+
+ THR_COMP_NEAR_NEARLA,
+ THR_COMP_NEW_NEARESTLA,
+ THR_COMP_NEAREST_NEWLA,
+ THR_COMP_NEW_NEARLA,
+ THR_COMP_NEAR_NEWLA,
+ THR_COMP_NEW_NEWLA,
+ THR_COMP_GLOBAL_GLOBALLA,
+
+ THR_COMP_NEAR_NEARL2A,
+ THR_COMP_NEW_NEARESTL2A,
+ THR_COMP_NEAREST_NEWL2A,
+ THR_COMP_NEW_NEARL2A,
+ THR_COMP_NEAR_NEWL2A,
+ THR_COMP_NEW_NEWL2A,
+ THR_COMP_GLOBAL_GLOBALL2A,
+
+ THR_COMP_NEAR_NEARL3A,
+ THR_COMP_NEW_NEARESTL3A,
+ THR_COMP_NEAREST_NEWL3A,
+ THR_COMP_NEW_NEARL3A,
+ THR_COMP_NEAR_NEWL3A,
+ THR_COMP_NEW_NEWL3A,
+ THR_COMP_GLOBAL_GLOBALL3A,
+
+ THR_COMP_NEAR_NEARGA,
+ THR_COMP_NEW_NEARESTGA,
+ THR_COMP_NEAREST_NEWGA,
+ THR_COMP_NEW_NEARGA,
+ THR_COMP_NEAR_NEWGA,
+ THR_COMP_NEW_NEWGA,
+ THR_COMP_GLOBAL_GLOBALGA,
+
+ THR_COMP_NEAR_NEARLB,
+ THR_COMP_NEW_NEARESTLB,
+ THR_COMP_NEAREST_NEWLB,
+ THR_COMP_NEW_NEARLB,
+ THR_COMP_NEAR_NEWLB,
+ THR_COMP_NEW_NEWLB,
+ THR_COMP_GLOBAL_GLOBALLB,
+
+ THR_COMP_NEAR_NEARL2B,
+ THR_COMP_NEW_NEARESTL2B,
+ THR_COMP_NEAREST_NEWL2B,
+ THR_COMP_NEW_NEARL2B,
+ THR_COMP_NEAR_NEWL2B,
+ THR_COMP_NEW_NEWL2B,
+ THR_COMP_GLOBAL_GLOBALL2B,
+
+ THR_COMP_NEAR_NEARL3B,
+ THR_COMP_NEW_NEARESTL3B,
+ THR_COMP_NEAREST_NEWL3B,
+ THR_COMP_NEW_NEARL3B,
+ THR_COMP_NEAR_NEWL3B,
+ THR_COMP_NEW_NEWL3B,
+ THR_COMP_GLOBAL_GLOBALL3B,
+
+ THR_COMP_NEAR_NEARGB,
+ THR_COMP_NEW_NEARESTGB,
+ THR_COMP_NEAREST_NEWGB,
+ THR_COMP_NEW_NEARGB,
+ THR_COMP_NEAR_NEWGB,
+ THR_COMP_NEW_NEWGB,
+ THR_COMP_GLOBAL_GLOBALGB,
+
+ THR_COMP_NEAR_NEARLA2,
+ THR_COMP_NEW_NEARESTLA2,
+ THR_COMP_NEAREST_NEWLA2,
+ THR_COMP_NEW_NEARLA2,
+ THR_COMP_NEAR_NEWLA2,
+ THR_COMP_NEW_NEWLA2,
+ THR_COMP_GLOBAL_GLOBALLA2,
+
+ THR_COMP_NEAR_NEARL2A2,
+ THR_COMP_NEW_NEARESTL2A2,
+ THR_COMP_NEAREST_NEWL2A2,
+ THR_COMP_NEW_NEARL2A2,
+ THR_COMP_NEAR_NEWL2A2,
+ THR_COMP_NEW_NEWL2A2,
+ THR_COMP_GLOBAL_GLOBALL2A2,
+
+ THR_COMP_NEAR_NEARL3A2,
+ THR_COMP_NEW_NEARESTL3A2,
+ THR_COMP_NEAREST_NEWL3A2,
+ THR_COMP_NEW_NEARL3A2,
+ THR_COMP_NEAR_NEWL3A2,
+ THR_COMP_NEW_NEWL3A2,
+ THR_COMP_GLOBAL_GLOBALL3A2,
+
+ THR_COMP_NEAR_NEARGA2,
+ THR_COMP_NEW_NEARESTGA2,
+ THR_COMP_NEAREST_NEWGA2,
+ THR_COMP_NEW_NEARGA2,
+ THR_COMP_NEAR_NEWGA2,
+ THR_COMP_NEW_NEWGA2,
+ THR_COMP_GLOBAL_GLOBALGA2,
+
+ THR_COMP_NEAR_NEARLL2,
+ THR_COMP_NEW_NEARESTLL2,
+ THR_COMP_NEAREST_NEWLL2,
+ THR_COMP_NEW_NEARLL2,
+ THR_COMP_NEAR_NEWLL2,
+ THR_COMP_NEW_NEWLL2,
+ THR_COMP_GLOBAL_GLOBALLL2,
+
+ THR_COMP_NEAR_NEARLL3,
+ THR_COMP_NEW_NEARESTLL3,
+ THR_COMP_NEAREST_NEWLL3,
+ THR_COMP_NEW_NEARLL3,
+ THR_COMP_NEAR_NEWLL3,
+ THR_COMP_NEW_NEWLL3,
+ THR_COMP_GLOBAL_GLOBALLL3,
+
+ THR_COMP_NEAR_NEARLG,
+ THR_COMP_NEW_NEARESTLG,
+ THR_COMP_NEAREST_NEWLG,
+ THR_COMP_NEW_NEARLG,
+ THR_COMP_NEAR_NEWLG,
+ THR_COMP_NEW_NEWLG,
+ THR_COMP_GLOBAL_GLOBALLG,
+
+ THR_COMP_NEAR_NEARBA,
+ THR_COMP_NEW_NEARESTBA,
+ THR_COMP_NEAREST_NEWBA,
+ THR_COMP_NEW_NEARBA,
+ THR_COMP_NEAR_NEWBA,
+ THR_COMP_NEW_NEWBA,
+ THR_COMP_GLOBAL_GLOBALBA,
+
+ THR_DC,
+ THR_PAETH,
+ THR_SMOOTH,
+ THR_SMOOTH_V,
+ THR_SMOOTH_H,
+ THR_H_PRED,
+ THR_V_PRED,
+ THR_D135_PRED,
+ THR_D203_PRED,
+ THR_D157_PRED,
+ THR_D67_PRED,
+ THR_D113_PRED,
+ THR_D45_PRED,
+
+ MAX_MODES,
+
+ LAST_SINGLE_REF_MODES = THR_GLOBALG,
+ MAX_SINGLE_REF_MODES = LAST_SINGLE_REF_MODES + 1,
+ LAST_COMP_REF_MODES = THR_COMP_GLOBAL_GLOBALBA,
+ MAX_COMP_REF_MODES = LAST_COMP_REF_MODES + 1
+} UENUM1BYTE(THR_MODES);
+
+enum {
+ THR_LAST,
+ THR_LAST2,
+ THR_LAST3,
+ THR_BWDR,
+ THR_ALTR2,
+ THR_GOLD,
+ THR_ALTR,
+
+ THR_COMP_LA,
+ THR_COMP_L2A,
+ THR_COMP_L3A,
+ THR_COMP_GA,
+
+ THR_COMP_LB,
+ THR_COMP_L2B,
+ THR_COMP_L3B,
+ THR_COMP_GB,
+
+ THR_COMP_LA2,
+ THR_COMP_L2A2,
+ THR_COMP_L3A2,
+ THR_COMP_GA2,
+
+ THR_INTRA,
+
+ MAX_REFS
+} UENUM1BYTE(THR_MODES_SUB8X8);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // AOM_AV1_ENCODER_ENC_ENUMS_H_
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 66e08dc..e897ab6 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3921,6 +3921,15 @@
}
#endif
+static INLINE void reset_thresh_freq_fact(MACROBLOCK *const x) {
+ int i, j;
+ for (i = 0; i < BLOCK_SIZES_ALL; ++i) {
+ for (j = 0; j < MAX_MODES; ++j) {
+ x->thresh_freq_fact[i][j] = 32;
+ }
+ }
+}
+
static void encode_sb_row(AV1_COMP *cpi, ThreadData *td, TileDataEnc *tile_data,
int mi_row, TOKENEXTRA **tp, int use_nonrd_mode) {
AV1_COMMON *const cm = &cpi->common;
@@ -3950,6 +3959,7 @@
av1_reset_loop_filter_delta(xd, av1_num_planes(cm));
}
}
+ reset_thresh_freq_fact(x);
// Code each SB in the row
for (int mi_col = tile_info->mi_col_start, sb_col_in_tile = 0;
@@ -4192,25 +4202,12 @@
AV1_COMMON *const cm = &cpi->common;
const int tile_cols = cm->tile_cols;
const int tile_rows = cm->tile_rows;
- int tile_col, tile_row;
if (cpi->tile_data != NULL) aom_free(cpi->tile_data);
CHECK_MEM_ERROR(
cm, cpi->tile_data,
aom_memalign(32, tile_cols * tile_rows * sizeof(*cpi->tile_data)));
cpi->allocated_tiles = tile_cols * tile_rows;
-
- for (tile_row = 0; tile_row < tile_rows; ++tile_row)
- for (tile_col = 0; tile_col < tile_cols; ++tile_col) {
- TileDataEnc *const tile_data =
- &cpi->tile_data[tile_row * tile_cols + tile_col];
- int i, j;
- for (i = 0; i < BLOCK_SIZES_ALL; ++i) {
- for (j = 0; j < MAX_MODES; ++j) {
- tile_data->thresh_freq_fact[i][j] = 32;
- }
- }
- }
}
void av1_init_tile_data(AV1_COMP *cpi) {
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 0f96e89..0341fbf 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -563,7 +563,6 @@
// TODO(jingning) All spatially adaptive variables should go to TileDataEnc.
typedef struct TileDataEnc {
TileInfo tile_info;
- int thresh_freq_fact[BLOCK_SIZES_ALL][MAX_MODES];
int m_search_count;
int ex_search_count;
CFL_CTX cfl;
diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 3e354de..764bfe0 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -1040,7 +1040,7 @@
unsigned int sse_y = UINT_MAX;
unsigned int var_y = UINT_MAX;
const int *const rd_threshes = cpi->rd.threshes[mi->segment_id][bsize];
- const int *const rd_thresh_freq_fact = tile_data->thresh_freq_fact[bsize];
+ const int *const rd_thresh_freq_fact = x->thresh_freq_fact[bsize];
InterpFilter filter_ref;
int const_motion[REF_FRAMES] = { 0 };
diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index ad6dace..f7aa5e5 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -50,237 +50,6 @@
// Factor to weigh the rate for switchable interp filters.
#define SWITCHABLE_INTERP_RATE_FACTOR 1
-// This enumerator type needs to be kept aligned with the mode order in
-// const MODE_DEFINITION av1_mode_order[MAX_MODES] used in the rd code.
-enum {
- THR_NEARESTMV,
- THR_NEARESTL2,
- THR_NEARESTL3,
- THR_NEARESTB,
- THR_NEARESTA2,
- THR_NEARESTA,
- THR_NEARESTG,
-
- THR_NEWMV,
- THR_NEWL2,
- THR_NEWL3,
- THR_NEWB,
- THR_NEWA2,
- THR_NEWA,
- THR_NEWG,
-
- THR_NEARMV,
- THR_NEARL2,
- THR_NEARL3,
- THR_NEARB,
- THR_NEARA2,
- THR_NEARA,
- THR_NEARG,
-
- THR_GLOBALMV,
- THR_GLOBALL2,
- THR_GLOBALL3,
- THR_GLOBALB,
- THR_GLOBALA2,
- THR_GLOBALG,
- THR_GLOBALA,
-
- THR_COMP_NEAREST_NEARESTLA,
- THR_COMP_NEAREST_NEARESTL2A,
- THR_COMP_NEAREST_NEARESTL3A,
- THR_COMP_NEAREST_NEARESTGA,
- THR_COMP_NEAREST_NEARESTLB,
- THR_COMP_NEAREST_NEARESTL2B,
- THR_COMP_NEAREST_NEARESTL3B,
- THR_COMP_NEAREST_NEARESTGB,
- THR_COMP_NEAREST_NEARESTLA2,
- THR_COMP_NEAREST_NEARESTL2A2,
- THR_COMP_NEAREST_NEARESTL3A2,
- THR_COMP_NEAREST_NEARESTGA2,
- THR_COMP_NEAREST_NEARESTLL2,
- THR_COMP_NEAREST_NEARESTLL3,
- THR_COMP_NEAREST_NEARESTLG,
- THR_COMP_NEAREST_NEARESTBA,
-
- THR_COMP_NEAR_NEARLA,
- THR_COMP_NEW_NEARESTLA,
- THR_COMP_NEAREST_NEWLA,
- THR_COMP_NEW_NEARLA,
- THR_COMP_NEAR_NEWLA,
- THR_COMP_NEW_NEWLA,
- THR_COMP_GLOBAL_GLOBALLA,
-
- THR_COMP_NEAR_NEARL2A,
- THR_COMP_NEW_NEARESTL2A,
- THR_COMP_NEAREST_NEWL2A,
- THR_COMP_NEW_NEARL2A,
- THR_COMP_NEAR_NEWL2A,
- THR_COMP_NEW_NEWL2A,
- THR_COMP_GLOBAL_GLOBALL2A,
-
- THR_COMP_NEAR_NEARL3A,
- THR_COMP_NEW_NEARESTL3A,
- THR_COMP_NEAREST_NEWL3A,
- THR_COMP_NEW_NEARL3A,
- THR_COMP_NEAR_NEWL3A,
- THR_COMP_NEW_NEWL3A,
- THR_COMP_GLOBAL_GLOBALL3A,
-
- THR_COMP_NEAR_NEARGA,
- THR_COMP_NEW_NEARESTGA,
- THR_COMP_NEAREST_NEWGA,
- THR_COMP_NEW_NEARGA,
- THR_COMP_NEAR_NEWGA,
- THR_COMP_NEW_NEWGA,
- THR_COMP_GLOBAL_GLOBALGA,
-
- THR_COMP_NEAR_NEARLB,
- THR_COMP_NEW_NEARESTLB,
- THR_COMP_NEAREST_NEWLB,
- THR_COMP_NEW_NEARLB,
- THR_COMP_NEAR_NEWLB,
- THR_COMP_NEW_NEWLB,
- THR_COMP_GLOBAL_GLOBALLB,
-
- THR_COMP_NEAR_NEARL2B,
- THR_COMP_NEW_NEARESTL2B,
- THR_COMP_NEAREST_NEWL2B,
- THR_COMP_NEW_NEARL2B,
- THR_COMP_NEAR_NEWL2B,
- THR_COMP_NEW_NEWL2B,
- THR_COMP_GLOBAL_GLOBALL2B,
-
- THR_COMP_NEAR_NEARL3B,
- THR_COMP_NEW_NEARESTL3B,
- THR_COMP_NEAREST_NEWL3B,
- THR_COMP_NEW_NEARL3B,
- THR_COMP_NEAR_NEWL3B,
- THR_COMP_NEW_NEWL3B,
- THR_COMP_GLOBAL_GLOBALL3B,
-
- THR_COMP_NEAR_NEARGB,
- THR_COMP_NEW_NEARESTGB,
- THR_COMP_NEAREST_NEWGB,
- THR_COMP_NEW_NEARGB,
- THR_COMP_NEAR_NEWGB,
- THR_COMP_NEW_NEWGB,
- THR_COMP_GLOBAL_GLOBALGB,
-
- THR_COMP_NEAR_NEARLA2,
- THR_COMP_NEW_NEARESTLA2,
- THR_COMP_NEAREST_NEWLA2,
- THR_COMP_NEW_NEARLA2,
- THR_COMP_NEAR_NEWLA2,
- THR_COMP_NEW_NEWLA2,
- THR_COMP_GLOBAL_GLOBALLA2,
-
- THR_COMP_NEAR_NEARL2A2,
- THR_COMP_NEW_NEARESTL2A2,
- THR_COMP_NEAREST_NEWL2A2,
- THR_COMP_NEW_NEARL2A2,
- THR_COMP_NEAR_NEWL2A2,
- THR_COMP_NEW_NEWL2A2,
- THR_COMP_GLOBAL_GLOBALL2A2,
-
- THR_COMP_NEAR_NEARL3A2,
- THR_COMP_NEW_NEARESTL3A2,
- THR_COMP_NEAREST_NEWL3A2,
- THR_COMP_NEW_NEARL3A2,
- THR_COMP_NEAR_NEWL3A2,
- THR_COMP_NEW_NEWL3A2,
- THR_COMP_GLOBAL_GLOBALL3A2,
-
- THR_COMP_NEAR_NEARGA2,
- THR_COMP_NEW_NEARESTGA2,
- THR_COMP_NEAREST_NEWGA2,
- THR_COMP_NEW_NEARGA2,
- THR_COMP_NEAR_NEWGA2,
- THR_COMP_NEW_NEWGA2,
- THR_COMP_GLOBAL_GLOBALGA2,
-
- THR_COMP_NEAR_NEARLL2,
- THR_COMP_NEW_NEARESTLL2,
- THR_COMP_NEAREST_NEWLL2,
- THR_COMP_NEW_NEARLL2,
- THR_COMP_NEAR_NEWLL2,
- THR_COMP_NEW_NEWLL2,
- THR_COMP_GLOBAL_GLOBALLL2,
-
- THR_COMP_NEAR_NEARLL3,
- THR_COMP_NEW_NEARESTLL3,
- THR_COMP_NEAREST_NEWLL3,
- THR_COMP_NEW_NEARLL3,
- THR_COMP_NEAR_NEWLL3,
- THR_COMP_NEW_NEWLL3,
- THR_COMP_GLOBAL_GLOBALLL3,
-
- THR_COMP_NEAR_NEARLG,
- THR_COMP_NEW_NEARESTLG,
- THR_COMP_NEAREST_NEWLG,
- THR_COMP_NEW_NEARLG,
- THR_COMP_NEAR_NEWLG,
- THR_COMP_NEW_NEWLG,
- THR_COMP_GLOBAL_GLOBALLG,
-
- THR_COMP_NEAR_NEARBA,
- THR_COMP_NEW_NEARESTBA,
- THR_COMP_NEAREST_NEWBA,
- THR_COMP_NEW_NEARBA,
- THR_COMP_NEAR_NEWBA,
- THR_COMP_NEW_NEWBA,
- THR_COMP_GLOBAL_GLOBALBA,
-
- THR_DC,
- THR_PAETH,
- THR_SMOOTH,
- THR_SMOOTH_V,
- THR_SMOOTH_H,
- THR_H_PRED,
- THR_V_PRED,
- THR_D135_PRED,
- THR_D203_PRED,
- THR_D157_PRED,
- THR_D67_PRED,
- THR_D113_PRED,
- THR_D45_PRED,
-
- MAX_MODES,
-
- LAST_SINGLE_REF_MODES = THR_GLOBALG,
- MAX_SINGLE_REF_MODES = LAST_SINGLE_REF_MODES + 1,
- LAST_COMP_REF_MODES = THR_COMP_GLOBAL_GLOBALBA,
- MAX_COMP_REF_MODES = LAST_COMP_REF_MODES + 1
-} UENUM1BYTE(THR_MODES);
-
-enum {
- THR_LAST,
- THR_LAST2,
- THR_LAST3,
- THR_BWDR,
- THR_ALTR2,
- THR_GOLD,
- THR_ALTR,
-
- THR_COMP_LA,
- THR_COMP_L2A,
- THR_COMP_L3A,
- THR_COMP_GA,
-
- THR_COMP_LB,
- THR_COMP_L2B,
- THR_COMP_L3B,
- THR_COMP_GB,
-
- THR_COMP_LA2,
- THR_COMP_L2A2,
- THR_COMP_L3A2,
- THR_COMP_GA2,
-
- THR_INTRA,
-
- MAX_REFS
-} UENUM1BYTE(THR_MODES_SUB8X8);
-
typedef struct RD_OPT {
// Thresh_mult is used to set a threshold for the rd score. A higher value
// means that we will accept the best mode so far more often. This number
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 6e6faa0..6a842dd 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -11641,7 +11641,6 @@
static void init_inter_mode_search_state(InterModeSearchState *search_state,
const AV1_COMP *cpi,
- const TileDataEnc *tile_data,
const MACROBLOCK *x, BLOCK_SIZE bsize,
int64_t best_rd_so_far) {
search_state->best_rd = best_rd_so_far;
@@ -11674,7 +11673,7 @@
const int *const rd_threshes = cpi->rd.threshes[segment_id][bsize];
for (int i = LAST_NEW_MV_INDEX + 1; i < MAX_MODES; ++i)
search_state->mode_threshold[i] =
- ((int64_t)rd_threshes[i] * tile_data->thresh_freq_fact[bsize][i]) >> 5;
+ ((int64_t)rd_threshes[i] * x->thresh_freq_fact[bsize][i]) >> 5;
search_state->best_intra_mode = DC_PRED;
search_state->best_intra_rd = INT64_MAX;
@@ -12583,8 +12582,7 @@
mode_skip_mask_t mode_skip_mask;
InterModeSearchState search_state;
- init_inter_mode_search_state(&search_state, cpi, tile_data, x, bsize,
- best_rd_so_far);
+ init_inter_mode_search_state(&search_state, cpi, x, bsize, best_rd_so_far);
INTERINTRA_MODE interintra_modes[REF_FRAMES] = {
INTERINTRA_MODES, INTERINTRA_MODES, INTERINTRA_MODES, INTERINTRA_MODES,
INTERINTRA_MODES, INTERINTRA_MODES, INTERINTRA_MODES, INTERINTRA_MODES
@@ -13058,9 +13056,8 @@
!is_inter_block(&search_state.best_mbmode));
if (!cpi->rc.is_src_frame_alt_ref)
- av1_update_rd_thresh_fact(cm, tile_data->thresh_freq_fact,
- sf->adaptive_rd_thresh, bsize,
- search_state.best_mode_index);
+ av1_update_rd_thresh_fact(cm, x->thresh_freq_fact, sf->adaptive_rd_thresh,
+ bsize, search_state.best_mode_index);
// macroblock modes
*mbmi = search_state.best_mbmode;
@@ -13220,8 +13217,7 @@
uint8_t motion_mode_skip_mask = 0; // second pass of single ref modes
InterModeSearchState search_state;
- init_inter_mode_search_state(&search_state, cpi, tile_data, x, bsize,
- best_rd_so_far);
+ init_inter_mode_search_state(&search_state, cpi, x, bsize, best_rd_so_far);
HandleInterModeArgs args = {
{ NULL }, { MAX_SB_SIZE, MAX_SB_SIZE, MAX_SB_SIZE },
{ NULL }, { MAX_SB_SIZE >> 1, MAX_SB_SIZE >> 1, MAX_SB_SIZE >> 1 },
@@ -13635,9 +13631,8 @@
!is_inter_block(&search_state.best_mbmode));
if (!cpi->rc.is_src_frame_alt_ref)
- av1_update_rd_thresh_fact(cm, tile_data->thresh_freq_fact,
- sf->adaptive_rd_thresh, bsize,
- search_state.best_mode_index);
+ av1_update_rd_thresh_fact(cm, x->thresh_freq_fact, sf->adaptive_rd_thresh,
+ bsize, search_state.best_mode_index);
// macroblock modes
*mbmi = search_state.best_mbmode;
@@ -13694,6 +13689,7 @@
const int64_t distortion2 = 0;
(void)mi_row;
(void)mi_col;
+ (void)tile_data;
av1_collect_neighbors_ref_counts(xd);
@@ -13785,8 +13781,8 @@
assert((cm->interp_filter == SWITCHABLE) ||
(cm->interp_filter == mbmi->interp_filters.as_filters.y_filter));
- av1_update_rd_thresh_fact(cm, tile_data->thresh_freq_fact,
- cpi->sf.adaptive_rd_thresh, bsize, THR_GLOBALMV);
+ av1_update_rd_thresh_fact(cm, x->thresh_freq_fact, cpi->sf.adaptive_rd_thresh,
+ bsize, THR_GLOBALMV);
av1_zero(best_pred_diff);
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 84faf6c..8284689 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -308,7 +308,6 @@
// sf->adaptive_motion_search = 1;
sf->recode_loop = ALLOW_RECODE_KFARFGF;
sf->use_accurate_subpel_search = USE_2_TAPS;
- sf->adaptive_rd_thresh = 2;
if (cpi->oxcf.enable_smooth_interintra)
sf->disable_smooth_interintra = boosted ? 0 : 1;
sf->tx_type_search.prune_mode = PRUNE_2D_FAST;
