1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00

avcodec/vvc/ctu: read act_enabled_flag for adaptive color transform

Signed-off-by: Wu Jianhua <toqsxw@outlook.com>
This commit is contained in:
Wu Jianhua
2025-05-14 21:40:21 +08:00
committed by Nuo Mi
parent b9c5fb0d00
commit c58357edc2

View File

@ -2150,10 +2150,9 @@ static int hls_coding_unit(VVCLocalContext *lc, int x0, int y0, int cb_width, in
mode_type = MODE_TYPE_INTRA; mode_type = MODE_TYPE_INTRA;
cu->pred_mode = pred_mode_decode(lc, tree_type, mode_type); cu->pred_mode = pred_mode_decode(lc, tree_type, mode_type);
if (cu->pred_mode == MODE_INTRA && sps->r->sps_act_enabled_flag && tree_type == SINGLE_TREE) { if (cu->pred_mode == MODE_INTRA && sps->r->sps_act_enabled_flag && tree_type == SINGLE_TREE)
avpriv_report_missing_feature(fc->log_ctx, "Adaptive Color Transform"); cu->act_enabled_flag = ff_vvc_cu_act_enabled_flag(lc);
return AVERROR_PATCHWELCOME;
}
if (cu->pred_mode == MODE_INTRA || cu->pred_mode == MODE_PLT) if (cu->pred_mode == MODE_INTRA || cu->pred_mode == MODE_PLT)
ret = intra_data(lc); ret = intra_data(lc);
else if (tree_type != DUAL_TREE_CHROMA) /* MODE_INTER or MODE_IBC */ else if (tree_type != DUAL_TREE_CHROMA) /* MODE_INTER or MODE_IBC */
@ -2169,10 +2168,8 @@ static int hls_coding_unit(VVCLocalContext *lc, int x0, int y0, int cb_width, in
if (cu->coded_flag) { if (cu->coded_flag) {
sbt_info(lc, sps); sbt_info(lc, sps);
if (sps->r->sps_act_enabled_flag && cu->pred_mode != MODE_INTRA && tree_type == SINGLE_TREE) { if (sps->r->sps_act_enabled_flag && cu->pred_mode != MODE_INTRA && tree_type == SINGLE_TREE)
avpriv_report_missing_feature(fc->log_ctx, "Adaptive Color Transform"); cu->act_enabled_flag = ff_vvc_cu_act_enabled_flag(lc);
return AVERROR_PATCHWELCOME;
}
lc->parse.lfnst_dc_only = 1; lc->parse.lfnst_dc_only = 1;
lc->parse.lfnst_zero_out_sig_coeff_flag = 1; lc->parse.lfnst_zero_out_sig_coeff_flag = 1;
lc->parse.mts_dc_only = 1; lc->parse.mts_dc_only = 1;