From patchwork Mon Nov 23 19:37:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24009 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 9A55C44B44C for ; Mon, 23 Nov 2020 21:41:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF0DE68BBED; Mon, 23 Nov 2020 21:38:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1E5168BC30 for ; Mon, 23 Nov 2020 21:38:30 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id l1so19773559wrb.9 for ; Mon, 23 Nov 2020 11:38:30 -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=qeTpabb811qUz9RceAusKSISFtq33U57wvyY7d3gb9w=; b=CmTth/37/Pd44MvpZaBRQaYdWGf+8Wy/QDk/TX3z7MmSF2rI1o60r3H5Sa5/GSTNAG CYPSEKEh0o0GGQB8StV00ublafaDYrTd7kD/ItqNubqEHSmb54P+rLD0jWQ5vSt+eVwd y7Z4yIpfOTvI/Gzf2j2Qj+WL9D+OqifY1EiwpuQlomuXxGP4SlwlQvAn6o29+JQT5zof +4XwzMqIw3qwseHG6Fsdu87D2njnsdo1v0poOwdxviwo8TckplFTPTyVB2ESpDYO4lwp L6LfVj6Y+7mZMKvFW+UbnrVbXaTHQs6gD7uEmQXouVGK22dJ+7rcK6qSi1vyTZRkAMuk qRHA== 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=qeTpabb811qUz9RceAusKSISFtq33U57wvyY7d3gb9w=; b=B43M2fmvEzuVbq0yThzVW2a99tzTeY9woJ5Q1AYpq6js5Kn+XIJgR0nubIXOY0qjEq LHsGkxzaLqXx2uxpFsVyBKpGvBI+5kLxF8sfwdGezIG8GiQoaQgEl/12SkJvjjG9m4hp wfx4Y4d2rAdnvs5TodIBm4pR2kystXq+Re20gzPviMvKIapWPC7XtKLx4RRt+BelPzfm tsdMDT2TomsNozUbg2Sro1gl6WhCUat8B/PWfydrzu+bP9G6XGES4YFo2iISO8f+yeXV fQveorC8D6D3IswNa4Ic/7CIhlzwd3DKVsG02w9s7pV1so7l+h0xtHrW4hrRqHpwHaMz txOw== X-Gm-Message-State: AOAM533NgqM4KSLf9w2Algr1WMeX/k1fNBcevBYxTMPedjuTomXlwb+R behlP4hCvlVt/mRbvM8q8gzBqpAIbjo4lQ== X-Google-Smtp-Source: ABdhPJyXtFwd+44hpajHFmlykXW2UB9N30bIjO3y9rZl3ayE52wvkFFPQ9CthdaKVNEmvJQGT7dy9A== X-Received: by 2002:adf:f2d1:: with SMTP id d17mr1252056wrp.339.1606160309917; Mon, 23 Nov 2020 11:38:29 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e6sm564086wme.27.2020.11.23.11.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:38:29 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:35 +0100 Message-Id: <20201123193739.1249300-25-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 187/191] avcodec/dsd: Make initializing DSD tables thread-safe 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" This automatically makes the DSD formats as well as DST and WavPack init-threadsafe. Signed-off-by: Andreas Rheinhardt --- libavcodec/dsd.c | 8 +++----- libavcodec/dsddec.c | 1 + libavcodec/dstdec.c | 1 + libavcodec/wavpack.c | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/dsd.c b/libavcodec/dsd.c index d48f87fa0f..95aab61ea4 100644 --- a/libavcodec/dsd.c +++ b/libavcodec/dsd.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/thread.h" #include "libavcodec/internal.h" #include "libavcodec/mathops.h" #include "avcodec.h" @@ -45,11 +46,8 @@ static av_cold void dsd_ctables_tableinit(void) av_cold void ff_init_dsd_data(void) { - static int done = 0; - if (done) - return; - dsd_ctables_tableinit(); - done = 1; + static AVOnce init_static_once = AV_ONCE_INIT; + ff_thread_once(&init_static_once, dsd_ctables_tableinit); } void ff_dsd2pcm_translate(DSDContext* s, size_t samples, int lsbf, diff --git a/libavcodec/dsddec.c b/libavcodec/dsddec.c index 39837a5ad9..375e49341f 100644 --- a/libavcodec/dsddec.c +++ b/libavcodec/dsddec.c @@ -125,6 +125,7 @@ AVCodec ff_##name_##_decoder = { \ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, \ .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, \ AV_SAMPLE_FMT_NONE }, \ + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, \ }; DSD_DECODER(DSD_LSBF, dsd_lsbf, "DSD (Direct Stream Digital), least significant bit first") diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c index 41e761d7e5..3fd710d2f6 100644 --- a/libavcodec/dstdec.c +++ b/libavcodec/dstdec.c @@ -389,4 +389,5 @@ AVCodec ff_dst_decoder = { .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index e02a56aa35..8fdabce335 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1712,5 +1712,6 @@ AVCodec ff_wavpack_decoder = { .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_INIT_THREADSAFE, };