highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/opusdec: Cleanup generically on init failure

Browse Source 
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-12-28 17:58:43 +01:00
parent f03eade869
commit 9f36a5a1cc
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libavcodec/opusdec.c
View File

@ -630,17 +630,14 @@ static av_cold int opus_decode_init(AVCodecContext *avctx)
/* find out the channel configuration */ /* find out the channel configuration */
ret = ff_opus_parse_extradata(avctx, c); ret = ff_opus_parse_extradata(avctx, c);
if (ret < 0) { if (ret < 0)
av_freep(&c->fdsp);
return ret; return ret;
}
/* allocate and init each independent decoder */ /* allocate and init each independent decoder */
c->streams = av_mallocz_array(c->nb_streams, sizeof(*c->streams)); c->streams = av_mallocz_array(c->nb_streams, sizeof(*c->streams));
if (!c->streams) { if (!c->streams) {
c->nb_streams = 0; c->nb_streams = 0;
ret = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
} }
for (i = 0; i < c->nb_streams; i++) { for (i = 0; i < c->nb_streams; i++) {
@ -660,10 +657,8 @@ static av_cold int opus_decode_init(AVCodecContext *avctx)
s->fdsp = c->fdsp; s->fdsp = c->fdsp;
s->swr =swr_alloc(); s->swr =swr_alloc();
if (!s->swr) { if (!s->swr)
ret = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
}
layout = (s->output_channels == 1) ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; layout = (s->output_channels == 1) ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO;
av_opt_set_int(s->swr, "in_sample_fmt", avctx->sample_fmt, 0); av_opt_set_int(s->swr, "in_sample_fmt", avctx->sample_fmt, 0);
@ -675,31 +670,24 @@ static av_cold int opus_decode_init(AVCodecContext *avctx)
ret = ff_silk_init(avctx, &s->silk, s->output_channels); ret = ff_silk_init(avctx, &s->silk, s->output_channels);
if (ret < 0) if (ret < 0)
goto fail; return ret;
ret = ff_celt_init(avctx, &s->celt, s->output_channels, c->apply_phase_inv); ret = ff_celt_init(avctx, &s->celt, s->output_channels, c->apply_phase_inv);
if (ret < 0) if (ret < 0)
goto fail; return ret;
s->celt_delay = av_audio_fifo_alloc(avctx->sample_fmt, s->celt_delay = av_audio_fifo_alloc(avctx->sample_fmt,
s->output_channels, 1024); s->output_channels, 1024);
if (!s->celt_delay) { if (!s->celt_delay)
ret = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
}
s->sync_buffer = av_audio_fifo_alloc(avctx->sample_fmt, s->sync_buffer = av_audio_fifo_alloc(avctx->sample_fmt,
s->output_channels, 32); s->output_channels, 32);
if (!s->sync_buffer) { if (!s->sync_buffer)
ret = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
}
} }
return 0; return 0;
fail:
opus_decode_close(avctx);
return ret;
} }
#define OFFSET(x) offsetof(OpusContext, x) #define OFFSET(x) offsetof(OpusContext, x)
@ -728,4 +716,5 @@ AVCodec ff_opus_decoder = {
.decode = opus_decode_packet, .decode = opus_decode_packet,
.flush = opus_decode_flush, .flush = opus_decode_flush,
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_CHANNEL_CONF, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_CHANNEL_CONF,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
}; };