[FFmpeg-devel] [PATCH 140/217] avcodec/cook: Make decoder init-threadsafe
Andreas Rheinhardt
andreas.rheinhardt at gmail.com
Wed Dec 2 06:21:27 EET 2020
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
libavcodec/cook.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index f552a57415..60b6bd6c19 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -44,6 +44,7 @@
#include "libavutil/channel_layout.h"
#include "libavutil/lfg.h"
+#include "libavutil/thread.h"
#include "audiodsp.h"
#include "avcodec.h"
@@ -1051,6 +1052,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;
@@ -1229,7 +1231,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);
@@ -1281,7 +1283,7 @@ 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,
};
--
2.25.1
More information about the ffmpeg-devel
mailing list