From patchwork Mon Nov 23 19:37:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24013 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 6B85E44AF49 for ; Mon, 23 Nov 2020 21:43:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49FA168BC05; Mon, 23 Nov 2020 21:43:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19FCA68BB17 for ; Mon, 23 Nov 2020 21:43:34 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id p22so338213wmg.3 for ; Mon, 23 Nov 2020 11:43:34 -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=+GHgrmfDk5+cLtPmytkkAWyKBRfZgVNW7O/qwjn0mtY=; b=ZPpT8AZOT/vCJ0b7FdAbMMrXnjbSEbH1VguBKwpzJ3fTW5XWU/sLBrpEu3d4qlohzq LIZsbMhQzei6/+Tz+6XQ8JN5vQIALTRKdgGxS61gcFe6P5unYUoNsNcQ00gebMv2Shms tlYnJlh67qnUWsb2XLaTfFeakhZOwhcj8VfWPoRji5/3mvbiPyA06G9GKQL/iVJo1IOH F17eKxTidp6eXF5tJUFBfkDol/QenOydNPPt/oz3yQ4WTKUFI7+zf5ZZNbbGKNMSOMta pxWnsQroULFfWbAXrOPapgOyqxa3kYdYYAPNBIh1q4dyw7dESJBWuTPxCwSUoUvyuAWO KfcA== 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=+GHgrmfDk5+cLtPmytkkAWyKBRfZgVNW7O/qwjn0mtY=; b=C5+nYxn6wJw7x9XZTcEs9N3NV1s2PCBEqhquw2yRs9HV8TOibRAGzfBUSBpoiBZVlf BUGIJgudlm4anfjmmSQ0CCQYWWTUPd3dr+JPb7cSNw1VpaUqb/BlxabKBc76NHC+f6en jWD7VvoOB83hoixSqpHJgO0rk7sCsvV+zeUrFeJRWYsCLWI3HTVNiv7+Pn9pvlFupO07 wjycvnFSEtBuExkFJE9eOvHiSj1uEl0Vbz5I1j/hzuWc+jmwsOygYs7KjR0/pjjpf5Hw Qd7TpJgNAva6v4tmYbzqol4+SpnrnSxVvC0kQuXtvoMZdSJ719OgI/tRS6Dr/B2+ZNl2 tnmA== X-Gm-Message-State: AOAM530jx7stVXmBqkEUcxjEEFZVunCO95WZ5Q3V03Jgbt8v39ibXCP2 U8pnh+fdBABUIalEP4skh9eqdxsZPDQbzg== X-Google-Smtp-Source: ABdhPJwvBWUWAODrJS6hsSHyg6cf9XMeQ2IzHuaXHnHvdAm2VL1LcVG8h+2sclLQA4/XAk41YpSCgA== X-Received: by 2002:a7b:cc13:: with SMTP id f19mr492584wmh.44.1606160270936; Mon, 23 Nov 2020 11:37:50 -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.37.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:37:50 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:11 +0100 Message-Id: <20201123193739.1249300-1-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 163/191] avcodec/atrac: Make generating 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/atrac.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c index 12e8997dbc..bf9878be45 100644 --- a/libavcodec/atrac.c +++ b/libavcodec/atrac.c @@ -30,6 +30,8 @@ #include #include +#include "libavutil/thread.h" + #include "avcodec.h" #include "atrac.h" @@ -45,22 +47,23 @@ static const float qmf_48tap_half[24] = { -0.043596379, -0.099384367, 0.13207909, 0.46424159 }; -av_cold void ff_atrac_generate_tables(void) +static av_cold void atrac_generate_tables(void) { - int i; - float s; - /* Generate scale factors */ - if (!ff_atrac_sf_table[63]) - for (i=0 ; i<64 ; i++) - ff_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0); + for (int i = 0; i < 64; i++) + ff_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0); /* Generate the QMF window. */ - if (!qmf_window[47]) - for (i=0 ; i<24; i++) { - s = qmf_48tap_half[i] * 2.0; - qmf_window[i] = qmf_window[47 - i] = s; - } + for (int i = 0; i < 24; i++) { + float s = qmf_48tap_half[i] * 2.0; + qmf_window[i] = qmf_window[47 - i] = s; + } +} + +av_cold void ff_atrac_generate_tables(void) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + ff_thread_once(&init_static_once, atrac_generate_tables); } av_cold void ff_atrac_init_gain_compensation(AtracGCContext *gctx, int id2exp_offset,