Skip to content

Move fsc termination condition to the top of search_tx_type #5431

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

Merged
urvangjoshi merged 1 commit into from
Sep 23, 2026
Merged

Move fsc termination condition to the top of search_tx_type #5431

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
14 changes: 7 additions & 7 deletions av2/encoder/tx_search.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2358,6 +2358,9 @@ static void search_tx_type(const AV2_COMP *cpi, MACROBLOCK *x, int plane,
const PREDICTION_MODE intra_mode = get_intra_mode(mbmi, plane);
const bool is_inter = is_inter_block(mbmi, xd->tree_type);
const bool is_lossless = xd->lossless[mbmi->segment_id];
const uint8_t txw = tx_size_wide[tx_size];
const uint8_t txh = tx_size_high[tx_size];

int64_t best_rd = INT64_MAX;
uint16_t best_eob = 0;
TX_TYPE best_tx_type = MAKE_TX_TYPE_FROM_PRIMARY_TX_TYPE(DCT_DCT);
Expand All @@ -2372,6 +2375,10 @@ static void search_tx_type(const AV2_COMP *cpi, MACROBLOCK *x, int plane,
plane ? 0 : blk_row * xd->tx_type_map_stride + blk_col;
av2_invalid_rd_stats(best_rd_stats);

if (is_fsc && (txw > FSC_MAXWIDTH || txh > FSC_MAXHEIGHT) &&
plane == AVM_PLANE_Y)
return;

skip_trellis |=
!is_trellis_used(cpi->optimize_seg_arr[mbmi->segment_id], DRY_RUN_NORMAL);
// Skip RDOQ in the dry pass, except under TCQ whose state-machine dequant
Expand Down Expand Up @@ -2407,8 +2414,6 @@ static void search_tx_type(const AV2_COMP *cpi, MACROBLOCK *x, int plane,
ROUND_POWER_OF_TWO(mb_plane->dequant_QTX[1], QUANT_TABLE_BITS) >>
dequant_shift;

const uint8_t txw = tx_size_wide[tx_size];
const uint8_t txh = tx_size_high[tx_size];
int64_t block_sse;
unsigned int block_mse_q8;
int dc_only_blk = 0;
Expand Down Expand Up @@ -2556,11 +2561,6 @@ static void search_tx_type(const AV2_COMP *cpi, MACROBLOCK *x, int plane,
const int max_eob = av2_get_max_eob(tx_size);
// Iterate through all transform type candidates.
for (int tx_idx = 0; tx_idx < PRIMARY_TX_TYPES; ++tx_idx) {
if (is_fsc && (txw > FSC_MAXWIDTH || txh > FSC_MAXHEIGHT) &&
plane == AVM_PLANE_Y) {
break;
}

PRIMARY_TX_TYPE primary_tx_type = txk_map[tx_idx];
if (prune_rectangular_tx_type(tx_idx, txfm_param.tx_set_type, plane, is_fsc,
is_rect_horz, allowed_tx_mask, best_tx_type,
Expand Down
Loading