* [FFmpeg-devel] [PATCH] avcodec/h264_metadata_bsf: remove AUDs at any position
@ 2023-02-02 17:51 Gyan Doshi
2023-02-03 15:23 ` Andreas Rheinhardt
0 siblings, 1 reply; 5+ messages in thread
From: Gyan Doshi @ 2023-02-02 17:51 UTC (permalink / raw)
To: ffmpeg-devel
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++) {
+ 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;
--
2.39.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH] avcodec/h264_metadata_bsf: remove AUDs at any position
2023-02-02 17:51 [FFmpeg-devel] [PATCH] avcodec/h264_metadata_bsf: remove AUDs at any position Gyan Doshi
@ 2023-02-03 15:23 ` Andreas Rheinhardt
2023-02-04 10:06 ` [FFmpeg-devel] [PATCH v2] " Gyan Doshi
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Rheinhardt @ 2023-02-03 15:23 UTC (permalink / raw)
To: ffmpeg-devel
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;
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* [FFmpeg-devel] [PATCH v2] avcodec/h264_metadata_bsf: remove AUDs at any position
2023-02-03 15:23 ` Andreas Rheinhardt
@ 2023-02-04 10:06 ` Gyan Doshi
2023-02-08 6:33 ` Gyan Doshi
0 siblings, 1 reply; 5+ messages in thread
From: Gyan Doshi @ 2023-02-04 10:06 UTC (permalink / raw)
To: ffmpeg-devel
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..b9cfeaba94 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 = au->nb_units - 1; i >= 0; 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;
--
2.39.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH v2] avcodec/h264_metadata_bsf: remove AUDs at any position
2023-02-04 10:06 ` [FFmpeg-devel] [PATCH v2] " Gyan Doshi
@ 2023-02-08 6:33 ` Gyan Doshi
2023-02-09 9:12 ` Gyan Doshi
0 siblings, 1 reply; 5+ messages in thread
From: Gyan Doshi @ 2023-02-08 6:33 UTC (permalink / raw)
To: ffmpeg-devel
On 2023-02-04 03:36 pm, Gyan Doshi wrote:
> 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.
Plan to push in 24h if no more comments.
> ---
> 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..b9cfeaba94 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 = au->nb_units - 1; i >= 0; 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;
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH v2] avcodec/h264_metadata_bsf: remove AUDs at any position
2023-02-08 6:33 ` Gyan Doshi
@ 2023-02-09 9:12 ` Gyan Doshi
0 siblings, 0 replies; 5+ messages in thread
From: Gyan Doshi @ 2023-02-09 9:12 UTC (permalink / raw)
To: ffmpeg-devel
On 2023-02-08 12:03 pm, Gyan Doshi wrote:
>
>
> On 2023-02-04 03:36 pm, Gyan Doshi wrote:
>> 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.
> Plan to push in 24h if no more comments.
Pushed as 159b028df58f480605b678109088e1b2ba8fdc71
Regards,
Gyan
>
>> ---
>> 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..b9cfeaba94 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 = au->nb_units - 1; i >= 0; 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;
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-09 9:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-02 17:51 [FFmpeg-devel] [PATCH] avcodec/h264_metadata_bsf: remove AUDs at any position Gyan Doshi
2023-02-03 15:23 ` Andreas Rheinhardt
2023-02-04 10:06 ` [FFmpeg-devel] [PATCH v2] " Gyan Doshi
2023-02-08 6:33 ` Gyan Doshi
2023-02-09 9:12 ` Gyan Doshi
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git