RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/rv40: Make decoder init-threadsafe 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-02-11 14:54:13 +01:00
parent 422e937586
commit 3e0b6f42e3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/rv40.c
View File

@ -27,6 +27,7 @@
#include "config.h" #include "config.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/thread.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
@ -555,14 +556,13 @@ static void rv40_loop_filter(RV34DecContext *r, int row)
*/ */
static av_cold int rv40_decode_init(AVCodecContext *avctx) static av_cold int rv40_decode_init(AVCodecContext *avctx)
{ {
static AVOnce init_static_once = AV_ONCE_INIT;
RV34DecContext *r = avctx->priv_data; RV34DecContext *r = avctx->priv_data;
int ret; int ret;
r->rv30 = 0; r->rv30 = 0;
if ((ret = ff_rv34_decode_init(avctx)) < 0) if ((ret = ff_rv34_decode_init(avctx)) < 0)
return ret; return ret;
if(!aic_top_vlc.bits)
rv40_init_tables();
r->parse_slice_header = rv40_parse_slice_header; r->parse_slice_header = rv40_parse_slice_header;
r->decode_intra_types = rv40_decode_intra_types; r->decode_intra_types = rv40_decode_intra_types;
r->decode_mb_info = rv40_decode_mb_info; r->decode_mb_info = rv40_decode_mb_info;
@ -570,6 +570,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx)
r->luma_dc_quant_i = rv40_luma_dc_quant[0]; r->luma_dc_quant_i = rv40_luma_dc_quant[0];
r->luma_dc_quant_p = rv40_luma_dc_quant[1]; r->luma_dc_quant_p = rv40_luma_dc_quant[1];
ff_rv40dsp_init(&r->rdsp); ff_rv40dsp_init(&r->rdsp);
ff_thread_once(&init_static_once, rv40_init_tables);
return 0; return 0;
} }
@ -590,5 +591,6 @@ const AVCodec ff_rv40_decoder = {
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}, },
.update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context), .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context),
.caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_ALLOCATE_PROGRESS,
}; };