From dd77e61182865e396195a19b1e6ec697717cef56 Mon Sep 17 00:00:00 2001 From: Lynne Date: Sat, 1 Oct 2022 12:20:10 +0200 Subject: lavu/tx: add ff_tx_clear_ctx() This function allows implementations to clean up a context after successfully initializing subcontexts. --- libavutil/tx.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'libavutil/tx.c') diff --git a/libavutil/tx.c b/libavutil/tx.c index 246a7aa980..13fb54f916 100644 --- a/libavutil/tx.c +++ b/libavutil/tx.c @@ -225,24 +225,35 @@ int ff_tx_gen_split_radix_parity_revtab(AVTXContext *s, int len, int inv, return 0; } -static void reset_ctx(AVTXContext *s) +static void reset_ctx(AVTXContext *s, int free_sub) { if (!s) return; if (s->sub) - for (int i = 0; i < s->nb_sub; i++) - reset_ctx(&s->sub[i]); + for (int i = 0; i < TX_MAX_SUB; i++) + reset_ctx(&s->sub[i], free_sub + 1); - if (s->cd_self->uninit) + if (s->cd_self && s->cd_self->uninit) s->cd_self->uninit(s); - av_freep(&s->sub); + if (free_sub) + av_freep(&s->sub); + av_freep(&s->map); av_freep(&s->exp); av_freep(&s->tmp); - memset(s, 0, sizeof(*s)); + /* Nothing else needs to be reset, it gets overwritten if another + * ff_tx_init_subtx() call is made. */ + s->nb_sub = 0; + s->opaque = NULL; + memset(s->fn, 0, sizeof(*s->fn)); +} + +void ff_tx_clear_ctx(AVTXContext *s) +{ + reset_ctx(s, 0); } av_cold void av_tx_uninit(AVTXContext **ctx) @@ -250,7 +261,7 @@ av_cold void av_tx_uninit(AVTXContext **ctx) if (!(*ctx)) return; - reset_ctx(*ctx); + reset_ctx(*ctx, 1); av_freep(ctx); } @@ -635,7 +646,7 @@ av_cold int ff_tx_init_subtx(AVTXContext *s, enum AVTXType type, s->fn[s->nb_sub] = NULL; s->cd[s->nb_sub] = NULL; - reset_ctx(sctx); + reset_ctx(sctx, 0); if (ret == AVERROR(ENOMEM)) break; } -- cgit v1.2.3