mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avcodec/ac3dec: Make decoders init-threadsafe
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
parent
10663312de
commit
42ee3898c8
@ -33,6 +33,7 @@
|
||||
#include "libavutil/crc.h"
|
||||
#include "libavutil/downmix_info.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/thread.h"
|
||||
#include "bswapdsp.h"
|
||||
#include "internal.h"
|
||||
#include "aac_ac3_parser.h"
|
||||
@ -183,12 +184,12 @@ static av_cold void ac3_tables_init(void)
|
||||
*/
|
||||
static av_cold int ac3_decode_init(AVCodecContext *avctx)
|
||||
{
|
||||
static AVOnce init_static_once = AV_ONCE_INIT;
|
||||
AC3DecodeContext *s = avctx->priv_data;
|
||||
int i, ret;
|
||||
|
||||
s->avctx = avctx;
|
||||
|
||||
ac3_tables_init();
|
||||
if ((ret = ff_mdct_init(&s->imdct_256, 8, 1, 1.0)) < 0 ||
|
||||
(ret = ff_mdct_init(&s->imdct_512, 9, 1, 1.0)) < 0)
|
||||
return ret;
|
||||
@ -226,6 +227,8 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
|
||||
s->dlyptr[i] = s->delay[i];
|
||||
}
|
||||
|
||||
ff_thread_once(&init_static_once, ac3_tables_init);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -182,5 +182,5 @@ AVCodec ff_ac3_fixed_decoder = {
|
||||
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
|
||||
AV_SAMPLE_FMT_NONE },
|
||||
.priv_class = &ac3_decoder_class,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
|
||||
};
|
||||
|
@ -67,7 +67,7 @@ AVCodec ff_ac3_decoder = {
|
||||
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
|
||||
AV_SAMPLE_FMT_NONE },
|
||||
.priv_class = &ac3_decoder_class,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
|
||||
};
|
||||
|
||||
#if CONFIG_EAC3_DECODER
|
||||
@ -92,6 +92,6 @@ AVCodec ff_eac3_decoder = {
|
||||
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
|
||||
AV_SAMPLE_FMT_NONE },
|
||||
.priv_class = &eac3_decoder_class,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
|
||||
};
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user