virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

lavc/vvc: Invalidate PPSs which refer to a changed SPS

Browse Source 
When the SPS associated with a particular SPS ID changes, invalidate all
the PPSs which use that SPS ID.  Fixes crashes with illegal bitstreams.
This is done in the CBS, rather than in libavcodec/vvc/ps.c like the SPS
ID reuse validation, as parts of the CBS parsing process for PPSs
depend on the SPS being referred to.

Signed-off-by: Frank Plowman <post@frankplowman.com>
This commit is contained in:
Frank Plowman 2024-06-14 10:37:17 +01:00 committed by Nuo Mi
parent 02430680b0
commit 8d6014dbc6
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/cbs_h2645.c
View File

@ -789,9 +789,28 @@ static int cbs_h26 ## h26n ## _replace_ ## ps_var(CodedBitstreamContext *ctx, \
}
cbs_h266_replace_ps(6, VPS, vps, vps_video_parameter_set_id)
cbs_h266_replace_ps(6, SPS, sps, sps_seq_parameter_set_id)
cbs_h266_replace_ps(6, PPS, pps, pps_pic_parameter_set_id)
static int cbs_h266_replace_sps(CodedBitstreamContext *ctx,
CodedBitstreamUnit *unit)
{
CodedBitstreamH266Context *priv = ctx->priv_data;
H266RawSPS *sps = unit->content;
unsigned int id = sps->sps_seq_parameter_set_id;
int err = ff_cbs_make_unit_refcounted(ctx, unit);
if (err < 0)
return err;
av_assert0(unit->content_ref);
if (priv->sps[id] && memcmp(priv->sps[id], unit->content_ref, sizeof(*priv->sps[id]))) {
for (unsigned int i = 0; i < VVC_MAX_PPS_COUNT; i++) {
if (priv->pps[i] && priv->pps[i]->pps_seq_parameter_set_id == id)
ff_refstruct_unref(&priv->pps[i]);
}
}
ff_refstruct_replace(&priv->sps[id], unit->content_ref);
return 0;
}
static int cbs_h266_replace_ph(CodedBitstreamContext *ctx,
CodedBitstreamUnit *unit,
H266RawPictureHeader *ph)