virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-29 21:47:48 +02:00
Code Issues Releases Activity

avcodec/qdm2: 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:09:31 +01:00
parent 03112cdcd1
commit 5f2b30ba06
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/qdm2.c
View File

@ -36,6 +36,7 @@
#include <stdio.h> #include <stdio.h>
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/thread.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
@ -1596,19 +1597,12 @@ static void qdm2_synthesis_filter(QDM2Context *q, int index)
* Init static data (does not depend on specific file) * Init static data (does not depend on specific file)
*/ */
static av_cold void qdm2_init_static_data(void) { static av_cold void qdm2_init_static_data(void) {
static int done;
if(done)
return;
qdm2_init_vlc(); qdm2_init_vlc();
softclip_table_init(); softclip_table_init();
rnd_table_init(); rnd_table_init();
init_noise_samples(); init_noise_samples();
ff_mpa_synth_init_float(); ff_mpa_synth_init_float();
done = 1;
} }
/** /**
@ -1616,12 +1610,11 @@ static av_cold void qdm2_init_static_data(void) {
*/ */
static av_cold int qdm2_decode_init(AVCodecContext *avctx) static av_cold int qdm2_decode_init(AVCodecContext *avctx)
{ {
static AVOnce init_static_once = AV_ONCE_INIT;
QDM2Context *s = avctx->priv_data; QDM2Context *s = avctx->priv_data;
int tmp_val, tmp, size; int tmp_val, tmp, size;
GetByteContext gb; GetByteContext gb;
qdm2_init_static_data();
/* extradata parsing /* extradata parsing
Structure: Structure:
@ -1767,6 +1760,8 @@ static av_cold int qdm2_decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_S16;
ff_thread_once(&init_static_once, qdm2_init_static_data);
return 0; return 0;
} }
@ -1883,4 +1878,5 @@ AVCodec ff_qdm2_decoder = {
.close = qdm2_decode_close, .close = qdm2_decode_close,
.decode = qdm2_decode_frame, .decode = qdm2_decode_frame,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
}; };