From patchwork Thu Dec 10 11:16:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24486 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 D443844AF7C for ; Thu, 10 Dec 2020 13:19:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7FF268A8B4; Thu, 10 Dec 2020 13:19:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C5C768A215 for ; Thu, 10 Dec 2020 13:19:16 +0200 (EET) Received: by mail-wr1-f51.google.com with SMTP id m5so5061357wrx.9 for ; Thu, 10 Dec 2020 03:19:16 -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=keh9XszbBt+Tb5nJS8IsA/KUrKuP8+9iqbmQnnpgAks=; b=qqwReuHt77neznZtn7wTxXjOOOTsOk0WUzqr6iJNGzHEIfDnJVafJMlAT3ZBSTUUG/ a6MQEc900u2pLXks+9dZ8EAxUzxYgDygmC21c148ENKODjQrUbakW4BcO5Q5lurMJQVl voNE/BfnAm1ftkakFcU9DnJ0OAGla+4M6qtNjX/fZ152YPrZJpHH70SSRdkI/dN1D1jl pvxOII9ZBnLvH9LUI3YD+CHuWkYbcVvMlXlr6V8AxWqaGOIEaJGpQJuymevKZQSzLCwV JRDa5/Orfzl0B0x+OojKzorc1NSQ2tGwZQNCUf/ViRy5RDc5Jt2XAfrfptLRjkrT/g95 XBVA== 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=keh9XszbBt+Tb5nJS8IsA/KUrKuP8+9iqbmQnnpgAks=; b=VWsL9g0sCd69X5JM5SLyPXzg+ECyOsFDXokbhAQd3To+YwS1ncQD8Y8gMgobh7cqAu UrO5ayq9qDL+rZYE16qN17xjPpoKQ+tLbvE8Wi7LrhRuFjpDPtSqv/85G3DjCuTbXEej bK3WApf8isKsHU05bwWs6FlwOBYXxzZgl+EXx+cd+qAY33tGoVU+Bk2dCoXHHnDX9E5w gUC2dm53v25aBNLxlzWK0HeOwRaRSiU0rRYJTkk4XOsX+8RoMjviXiC/prp+N+pv2KFw mPDx/mk0kUENQQ3Tiiybq4Goml12DVBGkqWN0NcDEUbJYoVcjCvWJQ1ktL0S3jocjjsu MKiw== X-Gm-Message-State: AOAM531Zqrl7VoBZplC7i//NZf04QIfu8dDu4N75zZPtJ/adNRiHhSVO EcU2CrWv6OmwFpntx13G5cwjsUOxedFsYQ== X-Google-Smtp-Source: ABdhPJyzVURjTBztk78g4GcgxWnx9ybTi5mDxf+ZfQ28bA3SJUUMOEphMVBsb9ab26Ulx9m4sp29Ug== X-Received: by 2002:a5d:4112:: with SMTP id l18mr7602556wrp.116.1607599155513; Thu, 10 Dec 2020 03:19:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:19:15 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:47 +0100 Message-Id: <20201210111657.2276739-30-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 29/39] avcodec/mpeg4videoenc: Make encoder 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/mpeg4videoenc.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index ca1c0dfd9c..8b98a1d507 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -23,6 +23,7 @@ #include "libavutil/attributes.h" #include "libavutil/log.h" #include "libavutil/opt.h" +#include "libavutil/thread.h" #include "mpegutils.h" #include "mpegvideo.h" #include "h263.h" @@ -1269,11 +1270,21 @@ static av_cold void init_uni_mpeg4_rl_tab(RLTable *rl, uint32_t *bits_tab, } } +static av_cold void mpeg4_encode_init_static(void) +{ + init_uni_dc_tab(); + + ff_mpeg4_init_rl_intra(); + + init_uni_mpeg4_rl_tab(&ff_mpeg4_rl_intra, uni_mpeg4_intra_rl_bits, uni_mpeg4_intra_rl_len); + init_uni_mpeg4_rl_tab(&ff_h263_rl_inter, uni_mpeg4_inter_rl_bits, uni_mpeg4_inter_rl_len); +} + static av_cold int encode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; MpegEncContext *s = avctx->priv_data; int ret; - static int done = 0; if (avctx->width >= (1<<13) || avctx->height >= (1<<13)) { av_log(avctx, AV_LOG_ERROR, "dimensions too large for MPEG-4\n"); @@ -1283,16 +1294,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((ret = ff_mpv_encode_init(avctx)) < 0) return ret; - if (!done) { - done = 1; - - init_uni_dc_tab(); - - ff_mpeg4_init_rl_intra(); - - init_uni_mpeg4_rl_tab(&ff_mpeg4_rl_intra, uni_mpeg4_intra_rl_bits, uni_mpeg4_intra_rl_len); - init_uni_mpeg4_rl_tab(&ff_h263_rl_inter, uni_mpeg4_inter_rl_bits, uni_mpeg4_inter_rl_len); - } + ff_thread_once(&init_static_once, mpeg4_encode_init_static); s->min_qcoeff = -2048; s->max_qcoeff = 2047; @@ -1399,6 +1401,6 @@ AVCodec ff_mpeg4_encoder = { .close = ff_mpv_encode_end, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .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 = &mpeg4enc_class, };