virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

avcodec/imc: Make imc/iac decoders init-threadsafe

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-15 11:42:24 +01:00
parent 83ff99adc4
commit 33aaf86192
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavcodec/imc.c
View File

@ -38,6 +38,7 @@
#include "libavutil/ffmath.h"
#include "libavutil/float_dsp.h"
#include "libavutil/internal.h"
#include "libavutil/thread.h"
#include "avcodec.h"
#include "bswapdsp.h"
#include "get_bits.h"
@ -171,10 +172,27 @@ static av_cold void iac_generate_tabs(IMCContext *q, int sampling_rate)
}
}
static av_cold void imc_init_static(void)
{
/* initialize the VLC tables */
for (int i = 0, offset = 0; i < 4 ; i++) {
for (int j = 0; j < 4; j++) {
huffman_vlc[i][j].table = &vlc_tables[offset];
huffman_vlc[i][j].table_allocated = VLC_TABLES_SIZE - offset;;
ff_init_vlc_from_lengths(&huffman_vlc[i][j], IMC_VLC_BITS, imc_huffman_sizes[i],
imc_huffman_lens[i][j], 1,
imc_huffman_syms[i][j], 1, 1,
0, INIT_VLC_STATIC_OVERLONG, NULL);
offset += huffman_vlc[i][j].table_size;
}
}
}
static av_cold int imc_decode_init(AVCodecContext *avctx)
{
int i, j, ret;
IMCContext *q = avctx->priv_data;
static AVOnce init_static_once = AV_ONCE_INIT;
AVFloatDSPContext *fdsp;
double r1, r2;
@ -229,19 +247,6 @@ static av_cold int imc_decode_init(AVCodecContext *avctx)
for (i = 0; i < 30; i++)
q->sqrt_tab[i] = sqrt(i);
/* initialize the VLC tables */
for (int i = 0, offset = 0; i < 4 ; i++) {
for (j = 0; j < 4; j++) {
huffman_vlc[i][j].table = &vlc_tables[offset];
huffman_vlc[i][j].table_allocated = VLC_TABLES_SIZE - offset;;
ff_init_vlc_from_lengths(&huffman_vlc[i][j], IMC_VLC_BITS, imc_huffman_sizes[i],
imc_huffman_lens[i][j], 1,
imc_huffman_syms[i][j], 1, 1,
0, INIT_VLC_STATIC_OVERLONG, NULL);
offset += huffman_vlc[i][j].table_size;
}
}
if (avctx->codec_id == AV_CODEC_ID_IAC) {
iac_generate_tabs(q, avctx->sample_rate);
} else {
@ -266,6 +271,8 @@ static av_cold int imc_decode_init(AVCodecContext *avctx)
avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO
: AV_CH_LAYOUT_STEREO;
ff_thread_once(&init_static_once, imc_init_static);
return 0;
}
@ -1088,6 +1095,7 @@ AVCodec ff_imc_decoder = {
.capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
#endif
#if CONFIG_IAC_DECODER
@ -1104,5 +1112,6 @@ AVCodec ff_iac_decoder = {
.capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
#endif