| Message ID | tencent_BC2ACB8F384F754636AE8C7CD54333C96A08@qq.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v3] lavc/hevc_ps: fix process failed when SPS before VPS in hvcC | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| yinshiyou/make_loongarch64 | warning | New warnings during build |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_x86 | warning | New warnings during build |
Ping > 2022年10月26日 10:23，1035567130@qq.com 写道： > > From: Wang Yaqiang <wangyaqiang03@kuaishou.com> > > In some videos, SPS will be stored before VPS in hvcC box, > parse SPS does not depend on VPS, so the video is expected to be processed normally. > Added "parsed_vps" parameter to indicate whether VPS have been parsed. > Only VPS have been parsed can be verified during SPS parsing. > > Signed-off-by: Wang Yaqiang <wangyaqiang03@kuaishou.com> > --- > libavcodec/hevc_parser.c | 8 ++++++++ > libavcodec/hevc_ps.c | 3 +-- > libavcodec/hevcdec.c | 9 ++++++++- > 3 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c > index 59f9a0ff3e..be4aa55e51 100644 > --- a/libavcodec/hevc_parser.c > +++ b/libavcodec/hevc_parser.c > @@ -85,8 +85,16 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal, > } > if (ps->sps != (HEVCSPS*)ps->sps_list[ps->pps->sps_id]->data) { > ps->sps = (HEVCSPS*)ps->sps_list[ps->pps->sps_id]->data; > + if (ps->sps->vps_id >= HEVC_MAX_VPS_COUNT || !ps->vps_list[ps->sps->vps_id]) { > + av_log(avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", ps->sps->vps_id); > + return AVERROR_INVALIDDATA; > + } > ps->vps = (HEVCVPS*)ps->vps_list[ps->sps->vps_id]->data; > } > + if (!ps->vps) { > + av_log(avctx, AV_LOG_ERROR, "VPS %d does not exist\n", ps->sps->vps_id); > + return AVERROR_INVALIDDATA; > + } > ow = &ps->sps->output_window; > > s->coded_width = ps->sps->width; > diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c > index f665d8053c..9abee8bd90 100644 > --- a/libavcodec/hevc_ps.c > +++ b/libavcodec/hevc_ps.c > @@ -916,9 +916,8 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, > sps->vps_id = get_bits(gb, 4); > > if (vps_list && !vps_list[sps->vps_id]) { > - av_log(avctx, AV_LOG_ERROR, "VPS %d does not exist\n", > + av_log(avctx, AV_LOG_WARNING, "VPS %d does not exist\n", > sps->vps_id); > - return AVERROR_INVALIDDATA; > } > > sps->max_sub_layers = get_bits(gb, 3) + 1; > diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c > index fb44d8d3f2..03942a150d 100644 > --- a/libavcodec/hevcdec.c > +++ b/libavcodec/hevcdec.c > @@ -327,6 +327,10 @@ static void export_stream_params(HEVCContext *s, const HEVCSPS *sps) > { > AVCodecContext *avctx = s->avctx; > const HEVCParamSets *ps = &s->ps; > + if (!s->ps.vps_list[sps->vps_id]) { > + av_log(avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", sps->vps_id); > + return; > + } > const HEVCVPS *vps = (const HEVCVPS*)ps->vps_list[sps->vps_id]->data; > const HEVCWindow *ow = &sps->output_window; > unsigned int num = 0, den = 0; > @@ -520,7 +524,10 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, > ret = pic_arrays_init(s, sps); > if (ret < 0) > goto fail; > - > + if (!s->ps.vps_list[sps->vps_id]) { > + ret = AVERROR_INVALIDDATA; > + goto fail; > + } > export_stream_params(s, sps); > > s->avctx->pix_fmt = pix_fmt; > -- > 2.33.0 >
diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index 59f9a0ff3e..be4aa55e51 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -85,8 +85,16 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal, } if (ps->sps != (HEVCSPS*)ps->sps_list[ps->pps->sps_id]->data) { ps->sps = (HEVCSPS*)ps->sps_list[ps->pps->sps_id]->data; + if (ps->sps->vps_id >= HEVC_MAX_VPS_COUNT || !ps->vps_list[ps->sps->vps_id]) { + av_log(avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", ps->sps->vps_id); + return AVERROR_INVALIDDATA; + } ps->vps = (HEVCVPS*)ps->vps_list[ps->sps->vps_id]->data; } + if (!ps->vps) { + av_log(avctx, AV_LOG_ERROR, "VPS %d does not exist\n", ps->sps->vps_id); + return AVERROR_INVALIDDATA; + } ow = &ps->sps->output_window; s->coded_width = ps->sps->width; diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index f665d8053c..9abee8bd90 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -916,9 +916,8 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, sps->vps_id = get_bits(gb, 4); if (vps_list && !vps_list[sps->vps_id]) { - av_log(avctx, AV_LOG_ERROR, "VPS %d does not exist\n", + av_log(avctx, AV_LOG_WARNING, "VPS %d does not exist\n", sps->vps_id); - return AVERROR_INVALIDDATA; } sps->max_sub_layers = get_bits(gb, 3) + 1; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index fb44d8d3f2..03942a150d 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -327,6 +327,10 @@ static void export_stream_params(HEVCContext *s, const HEVCSPS *sps) { AVCodecContext *avctx = s->avctx; const HEVCParamSets *ps = &s->ps; + if (!s->ps.vps_list[sps->vps_id]) { + av_log(avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", sps->vps_id); + return; + } const HEVCVPS *vps = (const HEVCVPS*)ps->vps_list[sps->vps_id]->data; const HEVCWindow *ow = &sps->output_window; unsigned int num = 0, den = 0; @@ -520,7 +524,10 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, ret = pic_arrays_init(s, sps); if (ret < 0) goto fail; - + if (!s->ps.vps_list[sps->vps_id]) { + ret = AVERROR_INVALIDDATA; + goto fail; + } export_stream_params(s, sps); s->avctx->pix_fmt = pix_fmt;