RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-04 23:31:01 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/ivi: Make initializing VLCs thread-safe

Browse Source 
This automatically makes indeo4/5 init-threadsafe.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-23 04:57:03 +01:00
parent ee4c129c11
commit 14be39e44a
3 changed files with 10 additions and 6 deletions

1
libavcodec/indeo4.c
View File

@ -713,4 +713,5 @@ AVCodec ff_indeo4_decoder = {
.close = ff_ivi_decode_close, .close = ff_ivi_decode_close,
.decode = ff_ivi_decode_frame, .decode = ff_ivi_decode_frame,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
}; };

2
libavcodec/indeo5.c
View File

@ -693,5 +693,5 @@ AVCodec ff_indeo5_decoder = {
.close = ff_ivi_decode_close, .close = ff_ivi_decode_close,
.decode = ff_ivi_decode_frame, .decode = ff_ivi_decode_frame,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
}; };

13
libavcodec/ivi.c
View File

@ -30,6 +30,7 @@
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/thread.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
@ -157,14 +158,11 @@ static int ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag)
(flag ? INIT_VLC_USE_NEW_STATIC : 0) | INIT_VLC_OUTPUT_LE); (flag ? INIT_VLC_USE_NEW_STATIC : 0) | INIT_VLC_OUTPUT_LE);
} }
av_cold void ff_ivi_init_static_vlc(void) static av_cold void ivi_init_static_vlc(void)
{ {
int i; int i;
static VLC_TYPE table_data[8192 * 16][2]; static VLC_TYPE table_data[8192 * 16][2];
static int initialized_vlcs = 0;
if (initialized_vlcs)
return;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
ivi_mb_vlc_tabs[i].table = table_data + i * 2 * 8192; ivi_mb_vlc_tabs[i].table = table_data + i * 2 * 8192;
ivi_mb_vlc_tabs[i].table_allocated = 8192; ivi_mb_vlc_tabs[i].table_allocated = 8192;
@ -175,7 +173,12 @@ av_cold void ff_ivi_init_static_vlc(void)
ivi_create_huff_from_desc(&ivi_blk_huff_desc[i], ivi_create_huff_from_desc(&ivi_blk_huff_desc[i],
&ivi_blk_vlc_tabs[i], 1); &ivi_blk_vlc_tabs[i], 1);
} }
initialized_vlcs = 1; }
av_cold void ff_ivi_init_static_vlc(void)
{
static AVOnce init_static_once = AV_ONCE_INIT;
ff_thread_once(&init_static_once, ivi_init_static_vlc);
} }
/* /*