* [FFmpeg-devel] [PATCH] avcodec/metasound, twinvqdec: Cleanup generically upon init failure
@ 2022-02-08 15:38 Andreas Rheinhardt
2022-02-11 9:23 ` Andreas Rheinhardt
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Rheinhardt @ 2022-02-08 15:38 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: 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,
};
--
2.32.0
_______________________________________________
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] 2+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/metasound, twinvqdec: Cleanup generically upon init failure
2022-02-08 15:38 [FFmpeg-devel] [PATCH] avcodec/metasound, twinvqdec: Cleanup generically upon init failure Andreas Rheinhardt
@ 2022-02-11 9:23 ` Andreas Rheinhardt
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Rheinhardt @ 2022-02-11 9:23 UTC (permalink / raw)
To: ffmpeg-devel
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
_______________________________________________
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] 2+ messages in thread
end of thread, other threads:[~2022-02-11 9:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-08 15:38 [FFmpeg-devel] [PATCH] avcodec/metasound, twinvqdec: Cleanup generically upon init failure Andreas Rheinhardt
2022-02-11 9:23 ` Andreas Rheinhardt
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