diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-06-17 05:42:12 +0200 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2019-07-07 22:17:07 +0100 |
| commit | 36fcdc3fbe089bc01066e2afa5645f383025f0ec (patch) | |
| tree | 9dd8747ccdaac0cb1997903678f6436871948b51 /libavcodec/filter_units_bsf.c | |
| parent | b0810454e473dd321a27c43de2d0e9d02fdba556 (diff) | |
av1/h264_metadata, filter_units: Count down when deleting units
When testing whether a particular unit should be kept or discarded, it
is best to start at the very last unit of a fragment and count down,
because that way a unit that will eventually be deleted won't be
memmoved during earlier deletions; and frag/au->nb_units need only be
evaluated once in this case and the counter is automatically correct
when a unit got deleted.
It also works for double loops, i.e. when looping over all SEI messages
in all SEI units of an access unit.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/filter_units_bsf.c')
| -rw-r--r-- | libavcodec/filter_units_bsf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/filter_units_bsf.c b/libavcodec/filter_units_bsf.c index f3691a5755..380f23e5a7 100644 --- a/libavcodec/filter_units_bsf.c +++ b/libavcodec/filter_units_bsf.c @@ -117,16 +117,14 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *pkt) goto fail; } - for (i = 0; i < frag->nb_units; i++) { + for (i = frag->nb_units - 1; i >= 0; i--) { for (j = 0; j < ctx->nb_types; j++) { if (frag->units[i].type == ctx->type_list[j]) break; } if (ctx->mode == REMOVE ? j < ctx->nb_types - : j >= ctx->nb_types) { + : j >= ctx->nb_types) ff_cbs_delete_unit(ctx->cbc, frag, i); - --i; - } } if (frag->nb_units == 0) { |