From patchwork Thu Dec 10 11:16:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24502 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7137D44A39A for ; Thu, 10 Dec 2020 13:24:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88C4068A965; Thu, 10 Dec 2020 13:19:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D07A568A8E6 for ; Thu, 10 Dec 2020 13:19:21 +0200 (EET) Received: by mail-wr1-f47.google.com with SMTP id r14so5070065wrn.0 for ; Thu, 10 Dec 2020 03:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=PGtrzwXcH0Hqz10RactpJh7IPMxPkMBhNRQ6n28QSik=; b=fMXsPRRzZ+o+tXojz2zP3YMsiZIRvI1TthbzaaAbvSriKEdaLfBduUoow7To2yR6iO 32/xZn/EPGLyVai+H9LCBRLsykJOQuOGkaaXFrbzDGqJLkzXeKQvQEikdnJD456ZdI7S Z/2BVEFWkBbjNshUvgv/x7Ws3+/dd90vvEvkRDxImz+tVvrSqpBEshNqe3/eJvfC/SKF pknofLdmIlVgpq09ZUj8rBTMEet2/pgrYaU9yqu7jl6V6X18R5fWv70ew2s5Ij9Zsv66 MRRg2WF4oAA74sZ62Tc4uAdRIbCiCdo5zSysC46iX4T6+lZQtsdKmdFHtXcT4iNRX4mh Uukg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=PGtrzwXcH0Hqz10RactpJh7IPMxPkMBhNRQ6n28QSik=; b=MIyqZmLYRPHODAZkejkxGwyrUonlBjN6BvSTBVno75XXsgHZV+9rb6v6xflvChKuiJ qJ0z8V0QmzJz49Jo3+HDrWZtFuO2sLVyUWiIBPBq/tG/ajWJEJ6ErC7vORYTZ0Tf92iC QcnhuKFpdGGWsEny34tVjrXwLbxNNyQLFAqq2Vo2pnFb/wPFy3QzGUXrSoc7Nn7Y1dKK uGwMRLynUBaPIZLGGqc5NgRp/KQ8VzyAKohsegBEfKZ5rDoYzkLEEfBL7hYOVUrRmb8C 7Tw2g+wOvYlvE0LSYNIWPl/MhpdlEsZ4xW0tFTUa8mBaFXWjZio04y9SIv59OVMWwBZc Khhg== X-Gm-Message-State: AOAM533UXI+TnG4IS2dXr7q4CjqRdIlLJ1T6UHIpn+C2cxnLbC0BkXK8 h0QHVCKnTL6JRC3hK4tOS/rnQaWdKamIfg== X-Google-Smtp-Source: ABdhPJyvdRsGZTNz5de9quWfAD9cp9hy842BlW3XRlzW/GtlC1xIwG1mJ1xCF42SjHQGmkaNMKVSQg== X-Received: by 2002:a5d:5147:: with SMTP id u7mr7826978wrt.114.1607599160848; Thu, 10 Dec 2020 03:19:20 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s133sm8942330wmf.38.2020.12.10.03.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:19:20 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:52 +0100 Message-Id: <20201210111657.2276739-35-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> References: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 34/39] avcodec/msmpeg4enc: Make msmpeg4 encoders init-threadsafe X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 6 +++--- libavcodec/msmpeg4enc.c | 33 +++++++++++++++++++-------------- libavcodec/wmv2enc.c | 2 +- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 8f4876b0ca..e3f217c22d 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -4836,7 +4836,7 @@ AVCodec ff_msmpeg4v2_encoder = { .init = ff_mpv_encode_init, .encode2 = ff_mpv_encode_picture, .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 }, .priv_class = &msmpeg4v2_class, }; @@ -4857,7 +4857,7 @@ AVCodec ff_msmpeg4v3_encoder = { .init = ff_mpv_encode_init, .encode2 = ff_mpv_encode_picture, .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 }, .priv_class = &msmpeg4v3_class, }; @@ -4878,7 +4878,7 @@ AVCodec ff_wmv1_encoder = { .init = ff_mpv_encode_init, .encode2 = ff_mpv_encode_picture, .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 }, .priv_class = &wmv1_class, }; diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 6d9911c2fb..3fd4d38820 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -32,6 +32,7 @@ #include "libavutil/attributes.h" #include "libavutil/avutil.h" +#include "libavutil/thread.h" #include "mpegvideo.h" #include "h263.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 code; 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; } -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; - - 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]; - /* init various encoding tables */ - init_done = 1; init_mv_table(&ff_mv_tables[0], mv_index_tables[0]); 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++){ int 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) diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 312dbc0834..781873a4b3 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -231,7 +231,7 @@ AVCodec ff_wmv2_encoder = { .init = wmv2_encode_init, .encode2 = ff_mpv_encode_picture, .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 }, };