Message ID | 20230202175101.1871-1-ffmpeg@gyani.pro |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel] avcodec/h264_metadata_bsf: remove AUDs at any position | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Gyan Doshi: > Some files, likely due to faulty packetization or muxing, can have AUDs > at other positions besides the head unit of a packet. Remove these too. > --- > libavcodec/h264_metadata_bsf.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c > index d318bf0cee..6fab0190d4 100644 > --- a/libavcodec/h264_metadata_bsf.c > +++ b/libavcodec/h264_metadata_bsf.c > @@ -469,12 +469,13 @@ static int h264_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, > H264MetadataContext *ctx = bsf->priv_data; > int err, i, has_sps, seek_point; > > - // If an AUD is present, it must be the first NAL unit. > - if (au->nb_units && au->units[0].type == H264_NAL_AUD) { > - if (ctx->aud == BSF_ELEMENT_REMOVE) > - ff_cbs_delete_unit(au, 0); > - } else { > - if (pkt && ctx->aud == BSF_ELEMENT_INSERT) { > + if (ctx->aud == BSF_ELEMENT_REMOVE) { > + for (i = 0; i < au->nb_units; i++) { You should count down here, otherwise you don't inspect the unit after an AUD. > + if (au->units[i].type == H264_NAL_AUD) > + ff_cbs_delete_unit(au, i); > + } > + } else if (ctx->aud == BSF_ELEMENT_INSERT) { > + if (pkt) { > err = h264_metadata_insert_aud(bsf, au); > if (err < 0) > return err;
diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index d318bf0cee..6fab0190d4 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -469,12 +469,13 @@ static int h264_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, H264MetadataContext *ctx = bsf->priv_data; int err, i, has_sps, seek_point; - // If an AUD is present, it must be the first NAL unit. - if (au->nb_units && au->units[0].type == H264_NAL_AUD) { - if (ctx->aud == BSF_ELEMENT_REMOVE) - ff_cbs_delete_unit(au, 0); - } else { - if (pkt && ctx->aud == BSF_ELEMENT_INSERT) { + if (ctx->aud == BSF_ELEMENT_REMOVE) { + for (i = 0; i < au->nb_units; i++) { + if (au->units[i].type == H264_NAL_AUD) + ff_cbs_delete_unit(au, i); + } + } else if (ctx->aud == BSF_ELEMENT_INSERT) { + if (pkt) { err = h264_metadata_insert_aud(bsf, au); if (err < 0) return err;