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

avcodec/indeo2: Make decoder init-threadsafe

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-15 22:48:35 +01:00
parent f25dde0e27
commit 0d71ac319f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/indeo2.c
View File

@ -25,6 +25,7 @@
*/
#include "libavutil/attributes.h"
#include "libavutil/thread.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
@ -225,8 +226,16 @@ static int ir2_decode_frame(AVCodecContext *avctx,
return buf_size;
}
static av_cold void ir2_init_static(void)
{
INIT_VLC_STATIC_FROM_LENGTHS(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
&ir2_tab[0][1], 2, &ir2_tab[0][0], 2, 1,
0, INIT_VLC_OUTPUT_LE, 1 << CODE_VLC_BITS);
}
static av_cold int ir2_decode_init(AVCodecContext *avctx)
{
static AVOnce init_static_once = AV_ONCE_INIT;
Ir2Context * const ic = avctx->priv_data;
ic->avctx = avctx;
@ -237,9 +246,7 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx)
if (!ic->picture)
return AVERROR(ENOMEM);
INIT_VLC_STATIC_FROM_LENGTHS(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
&ir2_tab[0][1], 2, &ir2_tab[0][0], 2, 1,
0, INIT_VLC_OUTPUT_LE, 1 << CODE_VLC_BITS);
ff_thread_once(&init_static_once, ir2_init_static);
return 0;
}
@ -263,4 +270,5 @@ AVCodec ff_indeo2_decoder = {
.close = ir2_decode_end,
.decode = ir2_decode_frame,
.capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};