| Message ID | AM7PR03MB66607E47A59344B0B4B0BC9E8F2D9@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | f5d6c78a8823b59f4a12af1a91e005f1e20903ce |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/metasound, twinvqdec: Cleanup generically upon init failure | 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 |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/metasound.c | 2 +- > libavcodec/twinvq.c | 5 +---- > libavcodec/twinvq.h | 1 + > libavcodec/twinvqdec.c | 2 +- > 4 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c > index 57851a43c5..f066182f02 100644 > --- a/libavcodec/metasound.c > +++ b/libavcodec/metasound.c > @@ -382,5 +382,5 @@ const AVCodec ff_metasound_decoder = { > .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, > .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, > AV_SAMPLE_FMT_NONE }, > - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, > + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, > }; > diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c > index 6dfaf06b14..38482e8c21 100644 > --- a/libavcodec/twinvq.c > +++ b/libavcodec/twinvq.c > @@ -783,13 +783,10 @@ av_cold int ff_twinvq_decode_init(AVCodecContext *avctx) > tctx->frames_per_packet = frames_per_packet; > > tctx->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); > - if (!tctx->fdsp) { > - ff_twinvq_decode_close(avctx); > + if (!tctx->fdsp) > return AVERROR(ENOMEM); > - } > if ((ret = init_mdct_win(tctx))) { > av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); > - ff_twinvq_decode_close(avctx); > return ret; > } > init_bitstream_params(tctx); > diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h > index 234604f581..5f49796f03 100644 > --- a/libavcodec/twinvq.h > +++ b/libavcodec/twinvq.h > @@ -197,6 +197,7 @@ static inline float twinvq_mulawinv(float y, float clip, float mu) > int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data, > int *got_frame_ptr, AVPacket *avpkt); > int ff_twinvq_decode_close(AVCodecContext *avctx); > +/** Requires the caller to call ff_twinvq_decode_close() upon failure. */ > int ff_twinvq_decode_init(AVCodecContext *avctx); > > #endif /* AVCODEC_TWINVQ_H */ > diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c > index 1fbe0bc32e..090a9fb0eb 100644 > --- a/libavcodec/twinvqdec.c > +++ b/libavcodec/twinvqdec.c > @@ -426,5 +426,5 @@ const AVCodec ff_twinvq_decoder = { > .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, > .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, > AV_SAMPLE_FMT_NONE }, > - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, > + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, > }; Will apply this later tonight unless there are objections. - Andreas
diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index 57851a43c5..f066182f02 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -382,5 +382,5 @@ const AVCodec ff_metasound_decoder = { .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c index 6dfaf06b14..38482e8c21 100644 --- a/libavcodec/twinvq.c +++ b/libavcodec/twinvq.c @@ -783,13 +783,10 @@ av_cold int ff_twinvq_decode_init(AVCodecContext *avctx) tctx->frames_per_packet = frames_per_packet; tctx->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); - if (!tctx->fdsp) { - ff_twinvq_decode_close(avctx); + if (!tctx->fdsp) return AVERROR(ENOMEM); - } if ((ret = init_mdct_win(tctx))) { av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); - ff_twinvq_decode_close(avctx); return ret; } init_bitstream_params(tctx); diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h index 234604f581..5f49796f03 100644 --- a/libavcodec/twinvq.h +++ b/libavcodec/twinvq.h @@ -197,6 +197,7 @@ static inline float twinvq_mulawinv(float y, float clip, float mu) int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt); int ff_twinvq_decode_close(AVCodecContext *avctx); +/** Requires the caller to call ff_twinvq_decode_close() upon failure. */ int ff_twinvq_decode_init(AVCodecContext *avctx); #endif /* AVCODEC_TWINVQ_H */ diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c index 1fbe0bc32e..090a9fb0eb 100644 --- a/libavcodec/twinvqdec.c +++ b/libavcodec/twinvqdec.c @@ -426,5 +426,5 @@ const AVCodec ff_twinvq_decoder = { .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/metasound.c | 2 +- libavcodec/twinvq.c | 5 +---- libavcodec/twinvq.h | 1 + libavcodec/twinvqdec.c | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-)