From 0c47b070e04141472358c84909aa6f001d81f1cb Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 30 Nov 2020 14:33:45 +0100 Subject: [PATCH] avcodec/cook: Make decoder init-threadsafe Signed-off-by: Andreas Rheinhardt --- libavcodec/cook.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 0c1d986c45..3720772102 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -45,6 +45,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/lfg.h" #include "libavutil/mem_internal.h" +#include "libavutil/thread.h" #include "audiodsp.h" #include "avcodec.h" @@ -1071,6 +1072,7 @@ static void dump_cook_context(COOKContext *q) */ static av_cold int cook_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; COOKContext *q = avctx->priv_data; GetByteContext gb; int s = 0; @@ -1249,7 +1251,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) } /* Generate tables */ - init_pow2table(); + ff_thread_once(&init_static_once, init_pow2table); init_gain_table(q); init_cplscales_table(q); @@ -1301,7 +1303,7 @@ const AVCodec ff_cook_decoder = { .close = cook_decode_close, .decode = cook_decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };