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

avcodec/msmpeg4enc: Make msmpeg4 encoders init-threadsafe

Browse Source 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-12-10 07:26:31 +01:00
committed by Andreas Rheinhardt
parent 1d5d666601
commit f4d16c3865
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpegvideo_enc.c
View File

@@ -4795,7 +4795,7 @@ AVCodec ff_msmpeg4v2_encoder = {
.init = ff_mpv_encode_init, .init = ff_mpv_encode_init,
.encode2 = ff_mpv_encode_picture, .encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end, .close = ff_mpv_encode_end,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.priv_class = &msmpeg4v2_class, .priv_class = &msmpeg4v2_class,
}; };
@@ -4816,7 +4816,7 @@ AVCodec ff_msmpeg4v3_encoder = {
.init = ff_mpv_encode_init, .init = ff_mpv_encode_init,
.encode2 = ff_mpv_encode_picture, .encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end, .close = ff_mpv_encode_end,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.priv_class = &msmpeg4v3_class, .priv_class = &msmpeg4v3_class,
}; };
@@ -4837,7 +4837,7 @@ AVCodec ff_wmv1_encoder = {
.init = ff_mpv_encode_init, .init = ff_mpv_encode_init,
.encode2 = ff_mpv_encode_picture, .encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end, .close = ff_mpv_encode_end,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
.priv_class = &wmv1_class, .priv_class = &wmv1_class,
}; };

33
libavcodec/msmpeg4enc.c
View File

@@ -32,6 +32,7 @@
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "libavutil/thread.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "h263.h" #include "h263.h"
#include "internal.h" #include "internal.h"
@@ -72,7 +73,9 @@ void ff_msmpeg4_code012(PutBitContext *pb, int n)
} }
} }
static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, int level, int intra){ static int get_size_of_code(const RLTable *rl, int last, int run,
int level, int intra)
{
int size=0; int size=0;
int code; int code;
int run_diff= intra ? 0 : 1; int run_diff= intra ? 0 : 1;
@@ -113,21 +116,10 @@ static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run,
return size; return size;
} }
av_cold void ff_msmpeg4_encode_init(MpegEncContext *s) static av_cold void msmpeg4_encode_init_static(void)
{ {
static int init_done=0;
int i; int i;
ff_msmpeg4_common_init(s);
if(s->msmpeg4_version>=4){
s->min_qcoeff= -255;
s->max_qcoeff= 255;
}
if (!init_done) {
static uint16_t mv_index_tables[2][4096]; static uint16_t mv_index_tables[2][4096];
/* init various encoding tables */
init_done = 1;
init_mv_table(&ff_mv_tables[0], mv_index_tables[0]); init_mv_table(&ff_mv_tables[0], mv_index_tables[0]);
init_mv_table(&ff_mv_tables[1], mv_index_tables[1]); init_mv_table(&ff_mv_tables[1], mv_index_tables[1]);
@@ -138,12 +130,25 @@ av_cold void ff_msmpeg4_encode_init(MpegEncContext *s)
for(run=0; run<=MAX_RUN; run++){ for(run=0; run<=MAX_RUN; run++){
int last; int last;
for(last=0; last<2; last++){ for(last=0; last<2; last++){
rl_length[i][level][run][last]= get_size_of_code(s, &ff_rl_table[ i], last, run, level, 0); rl_length[i][level][run][last] = get_size_of_code(&ff_rl_table[i], last, run, level, 0);
} }
} }
} }
} }
} }
av_cold void ff_msmpeg4_encode_init(MpegEncContext *s)
{
static AVOnce init_static_once = AV_ONCE_INIT;
ff_msmpeg4_common_init(s);
if (s->msmpeg4_version >= 4) {
s->min_qcoeff = -255;
s->max_qcoeff = 255;
}
/* init various encoding tables */
ff_thread_once(&init_static_once, msmpeg4_encode_init_static);
} }
static void find_best_tables(MpegEncContext * s) static void find_best_tables(MpegEncContext * s)

2
libavcodec/wmv2enc.c
View File

@@ -231,7 +231,7 @@ AVCodec ff_wmv2_encoder = {
.init = wmv2_encode_init, .init = wmv2_encode_init,
.encode2 = ff_mpv_encode_picture, .encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end, .close = ff_mpv_encode_end,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE }, AV_PIX_FMT_NONE },
}; };