1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

cbs_h266: slice_header, fix inference for pred_weight_table

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Nuo Mi
2023-08-08 18:59:03 +08:00
committed by James Almer
parent 763eb59187
commit 81a48d96e2

View File

@@ -3226,6 +3226,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
} else { } else {
infer(sh_collocated_ref_idx, 0); infer(sh_collocated_ref_idx, 0);
} }
}
if (!pps->pps_wp_info_in_ph_flag && if (!pps->pps_wp_info_in_ph_flag &&
((pps->pps_weighted_pred_flag && ((pps->pps_weighted_pred_flag &&
current->sh_slice_type == VVC_SLICE_TYPE_P) || current->sh_slice_type == VVC_SLICE_TYPE_P) ||
@@ -3236,8 +3237,6 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
&current->sh_pred_weight_table)); &current->sh_pred_weight_table));
} }
} }
}
qp_bd_offset = 6 * sps->sps_bitdepth_minus8; qp_bd_offset = 6 * sps->sps_bitdepth_minus8;
if (!pps->pps_qp_delta_info_in_ph_flag) if (!pps->pps_qp_delta_info_in_ph_flag)
se(sh_qp_delta, -qp_bd_offset - (26 + pps->pps_init_qp_minus26), se(sh_qp_delta, -qp_bd_offset - (26 + pps->pps_init_qp_minus26),