Skip to content

Reduce TX partition stationarity pruning margin to 1 for speed 5 #5397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chengchen-google wants to merge 1 commit into
base: av2-enc
Choose a base branch
from
Open

Reduce TX partition stationarity pruning margin to 1 for speed 5 #5397

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions av2/encoder/tx_search.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3231,7 +3231,8 @@ static AVM_INLINE int skip_tx_partition_by_eval_type(
// single partition trial.
static AVM_INLINE void measure_residual_stationarity(
const MACROBLOCK *x, BLOCK_SIZE plane_bsize, int blk_row, int blk_col,
TX_SIZE max_tx_size, int *stationary_rows, int *stationary_cols) {
TX_SIZE max_tx_size, int margin, int *stationary_rows,
int *stationary_cols) {
*stationary_rows = 0;
*stationary_cols = 0;

Expand Down Expand Up @@ -3283,9 +3284,9 @@ static AVM_INLINE void measure_residual_stationarity(
}

// max <= mean * (1 + 1/margin), written without division.
const uint64_t bound = mean * (TX_PART_STATIONARITY_MARGIN + 1);
*stationary_rows = (max_row * TX_PART_STATIONARITY_MARGIN <= bound);
*stationary_cols = (max_col * TX_PART_STATIONARITY_MARGIN <= bound);
const uint64_t bound = mean * (margin + 1);
*stationary_rows = (max_row * margin <= bound);
*stationary_cols = (max_col * margin <= bound);
}

// True when `type` cuts the block along an axis the residual is stationary on,
Expand Down Expand Up @@ -3381,8 +3382,10 @@ static void select_tx_partition_type(

if (cpi->sf.tx_sf.prune_tx_part_stationarity && type != TX_PARTITION_NONE) {
if (!stationarity_valid) {
const int margin =
cpi->oxcf.speed >= 5 ? 1 : TX_PART_STATIONARITY_MARGIN;
measure_residual_stationarity(x, plane_bsize, blk_row, blk_col,
max_tx_size, &stationary_rows,
max_tx_size, margin, &stationary_rows,
&stationary_cols);
stationarity_valid = 1;
}
Expand Down