mirror of
https://github.com/ultravideo/uvg266.git
synced 2024-11-24 02:24:07 +00:00
[mts] Don't do tr-skip when tr-skip is disabled
This commit is contained in:
parent
dc7c8eeb41
commit
f9212b4e44
|
@ -1738,7 +1738,6 @@ void uvg_encode_coding_tree(
|
||||||
encode_transform_coeff(state, x, y, depth, 0, 0, 0, 1, coeff, tree_type);
|
encode_transform_coeff(state, x, y, depth, 0, 0, 0, 1, coeff, tree_type);
|
||||||
// Write LFNST only once for single tree structure
|
// Write LFNST only once for single tree structure
|
||||||
encode_lfnst_idx(state, cabac, tmp, x, y, depth, cu_width, cu_height, tree_type, COLOR_UV);
|
encode_lfnst_idx(state, cabac, tmp, x, y, depth, cu_width, cu_height, tree_type, COLOR_UV);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -369,7 +369,7 @@ static double search_intra_trdepth(
|
||||||
pred_cu->violates_mts_coeff_constraint = 0;
|
pred_cu->violates_mts_coeff_constraint = 0;
|
||||||
|
|
||||||
if (trafo == MTS_SKIP && width > (
|
if (trafo == MTS_SKIP && width > (
|
||||||
1 << state->encoder_control->cfg.trskip_max_size)) {
|
1 << state->encoder_control->cfg.trskip_max_size) || !state->encoder_control->cfg.trskip_enable) {
|
||||||
//TODO: parametrize that this is not hardcoded
|
//TODO: parametrize that this is not hardcoded
|
||||||
// TODO: this probably should currently trip for chroma?
|
// TODO: this probably should currently trip for chroma?
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in a new issue