har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mpegvideo_enc: Make mpv_encode_defaults thread-safe

Browse Source 
This is a prerequisite for making any encoder that uses
ff_mpv_encode_init() init-threadsafe; it already makes the AMV,
the MJPEG and the MPEG-1/2 encoders init-threadsafe.

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-09 04:24:44 +01:00
parent 27eea249cc
commit 44bb776f13
3 changed files with 15 additions and 8 deletions

4
libavcodec/mjpegenc.c

@ -415,7 +415,7 @@ AVCodec ff_mjpeg_encoder = {
.encode2 = ff_mpv_encode_picture, .encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end, .close = ff_mpv_encode_end,
.capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
.pix_fmts = (const enum AVPixelFormat[]) { .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE
}, },
@ -441,7 +441,7 @@ AVCodec ff_amv_encoder = {
.init = ff_mpv_encode_init, .init = ff_mpv_encode_init,
.encode2 = amv_encode_picture, .encode2 = amv_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[]) { .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE
}, },

4
libavcodec/mpeg12enc.c

@ -1199,7 +1199,7 @@ AVCodec ff_mpeg1video_encoder = {
.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 },
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
.priv_class = &mpeg1_class, .priv_class = &mpeg1_class,
}; };
@ -1217,7 +1217,7 @@ AVCodec ff_mpeg2video_encoder = {
AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P,
AV_PIX_FMT_NONE }, AV_PIX_FMT_NONE },
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
.priv_class = &mpeg2_class, .priv_class = &mpeg2_class,
}; };
#endif /* CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER */ #endif /* CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER */

15
libavcodec/mpegvideo_enc.c

@ -39,6 +39,7 @@
#include "libavutil/mem_internal.h" #include "libavutil/mem_internal.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/thread.h"
#include "avcodec.h" #include "avcodec.h"
#include "dct.h" #include "dct.h"
#include "idctdsp.h" #include "idctdsp.h"
@ -249,18 +250,24 @@ static void update_duplicate_context_after_me(MpegEncContext *dst,
#undef COPY #undef COPY
} }
static void mpv_encode_init_static(void)
{
for (int i = -16; i < 16; i++)
default_fcode_tab[i + MAX_MV] = 1;
}
/** /**
* Set the given MpegEncContext to defaults for encoding. * Set the given MpegEncContext to defaults for encoding.
* the changed fields will not depend upon the prior state of the MpegEncContext. * the changed fields will not depend upon the prior state of the MpegEncContext.
*/ */
static void mpv_encode_defaults(MpegEncContext *s) static void mpv_encode_defaults(MpegEncContext *s)
{ {
int i; static AVOnce init_static_once = AV_ONCE_INIT;
ff_mpv_common_defaults(s); ff_mpv_common_defaults(s);
for (i = -16; i < 16; i++) { ff_thread_once(&init_static_once, mpv_encode_init_static);
default_fcode_tab[i + MAX_MV] = 1;
}
s->me.mv_penalty = default_mv_penalty; s->me.mv_penalty = default_mv_penalty;
s->fcode_tab = default_fcode_tab; s->fcode_tab = default_fcode_tab;