From patchwork Wed Dec 30 23:31:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24720 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 B521A44BA0E for ; Thu, 31 Dec 2020 01:36:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0956768AA2F; Thu, 31 Dec 2020 01:33:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E899A68AA42 for ; Thu, 31 Dec 2020 01:33:00 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id ce23so23673381ejb.8 for ; Wed, 30 Dec 2020 15:33:00 -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=K4UqQUQWDIIZrMcTX5R+tLHSTm+C1uZeZ3TrW64TEW8=; b=o2cngrW41eeRDXSQmrofzJiL2jgdycxQgNRNNOdrNeJu2XLJ4aRdr8Vapm55sdnaxx wDYSN07NVZAoJ7dkg2HXbjq0JMWmDM+uCcPR5TDn5maR3tQfJa2L6zgZk5ep1o7AJfw+ tePj0EPpBM3mp41zrWEk0LvjRcoPCPFzi2D231CoR3K+2qZ65DNhCeolfdvngawVnsP2 Zgql5+RKVtvHh0ohTtQ8yK/uqpiGooxbBWkb7vKMmcSzpnTVW8ZRiwgn5LuAzjpmD3d3 +2nUEN9lMPvzIu7pUK0LuhH9LRdXl6Uy/kO1sSZf4QJs8U0yI1rpiwZb+aay6DqiFFPt Jn5Q== 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=K4UqQUQWDIIZrMcTX5R+tLHSTm+C1uZeZ3TrW64TEW8=; b=TVgWdjmF7quwd1JbHpPlsmobec9ljyAb7NbAK2y/PB4Svji0XkZXnZjoSvpKFzINqA iHOSrWEA6csko8kvtCJnwLd0A/JcQ+DjE92NydOPiRn8ktuYZlABkWh0KTGrgrM2/3r5 DfPK0mPgaOACkeOgnEjMFFpOPvDqgza3Bycj5UJKAyg9X1kLBp8/hqtxrNba4nsuHahI JJwOrfXJ0146bGHD2oZqcxyMFsDcyrzqgoPtzBxB9YZxfeJq0dxzJYHjNtYqybunm/Pf 2rK7X0d9jjaGmuZsO50NQ118KAw8YfhmkpiUnEIhRFa8Z5Ecm5xr8jyst9xVPkdrY7iK 58ew== X-Gm-Message-State: AOAM531pAaFgwrwstlEB5+8Y4dm2q6Rqq3zxKF46K/CRRJQgUUUcqYlW ACU/s2YXxG9pm+slhXTdEqohYXVC5b4= X-Google-Smtp-Source: ABdhPJw7vCMIE4eSE50Uiupi7NZvuXxenVq+Au7FrBy8cMEh4NL9QTUqfA6TCdeW28nsnGcQbBLrOg== X-Received: by 2002:a17:907:20cc:: with SMTP id qq12mr53651050ejb.316.1609371180331; Wed, 30 Dec 2020 15:33:00 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u19sm19630409ejg.16.2020.12.30.15.32.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 15:32:59 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Dec 2020 00:31:55 +0100 Message-Id: <20201230233157.1055287-28-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> References: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 28/30] avcodec/dvdec: Make decoder 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/dvdec.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index 85619a42a8..e36df10d1b 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -39,6 +39,7 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/pixdesc.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "dv.h" @@ -141,12 +142,6 @@ static void dv_init_static(void) uint8_t new_dv_vlc_run[NB_DV_VLC * 2]; int16_t new_dv_vlc_level[NB_DV_VLC * 2]; int i, j; - static int done = 0; - - if (done) - return; - - done = 1; /* it's faster to include sign bit in a generic VLC parsing scheme */ for (i = 0, j = 0; i < NB_DV_VLC; i++, j++) { @@ -239,6 +234,7 @@ static void dv_init_weight_tables(DVVideoContext *ctx, const AVDVProfile *d) static av_cold int dvvideo_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; DVVideoContext *s = avctx->priv_data; int i; @@ -258,7 +254,7 @@ static av_cold int dvvideo_decode_init(AVCodecContext *avctx) s->idct_put[0] = s->idsp.idct_put; s->idct_put[1] = ff_simple_idct248_put; - dv_init_static(); + ff_thread_once(&init_static_once, dv_init_static); return ff_dvvideo_init(avctx); } @@ -694,4 +690,5 @@ AVCodec ff_dvvideo_decoder = { .decode = dvvideo_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, .max_lowres = 3, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };