diff options
| author | James Almer <jamrial@gmail.com> | 2024-10-05 19:56:34 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-10-11 16:17:48 -0300 |
| commit | bd6283342c85494cd8ed0283715a6da8f5a4ccf0 (patch) | |
| tree | fd5040ec3bf05ae54d8f78ca4b507a0d448f6bef | |
| parent | 3290692d185e2da8e40f219176b3f7f13bcb3da0 (diff) | |
| download | ffmpeg-bd6283342c85494cd8ed0283715a6da8f5a4ccf0.tar.gz | |
avcodec/hevc/ps: add a range check for sps_max_sub_layers
It can't be higher than vps_max_sub_layers.
Do this while keeping the workaround for qsvenc_hevc calling ff_hevc_parse_sps()
without a vps_list, as in some cases it needs to parse an sps to generate a fake
vps derived from it.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/hevc/ps.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/hevc/ps.c b/libavcodec/hevc/ps.c index ffb2436d7f..a1d352eec5 100644 --- a/libavcodec/hevc/ps.c +++ b/libavcodec/hevc/ps.c @@ -1158,6 +1158,7 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, HEVCWindow *ow; int ret = 0; int bit_depth_chroma, num_comps, multi_layer_ext; + int vps_max_sub_layers; int i; // Coded parameters @@ -1182,7 +1183,10 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, sps->max_sub_layers = sps->vps->vps_max_sub_layers; } - if (sps->max_sub_layers > HEVC_MAX_SUB_LAYERS) { + vps_max_sub_layers = sps->vps ? sps->vps->vps_max_sub_layers + : FFMIN(sps->max_sub_layers, HEVC_MAX_SUB_LAYERS); + + if (sps->max_sub_layers > vps_max_sub_layers) { av_log(avctx, AV_LOG_ERROR, "sps_max_sub_layers out of range: %d\n", sps->max_sub_layers); return AVERROR_INVALIDDATA; |