From patchwork Fri Nov 20 07:19:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23812 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 0A10944AD73 for ; Fri, 20 Nov 2020 09:34:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F258B68BB75; Fri, 20 Nov 2020 09:25:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0E7868BAA0 for ; Fri, 20 Nov 2020 09:25:08 +0200 (EET) Received: by mail-ed1-f65.google.com with SMTP id t11so8445075edj.13 for ; Thu, 19 Nov 2020 23:25:08 -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=0GLnlGSGAwBn75b0MQeaSNqtdr0OID8M1d194gsidV0=; b=NM3U/hpo7INo4uIEU6IrZQc9XrASIfu+pbsn1E+8Pv546337wAnQHOYq3ZMUuJmGkd tQvOrS1insVY1u0eJ8FF/JBzqeHhdZT+yKRIR0nIMXqBpUGU1byuqsTbRzmo7mee6lnj QmVizBSeQe6B2CWZiTmDVXgJe51iknZIJiY2KDx1M+7iPuUP9pu2KnnbSOjIrYqnwCVH MJom0B4U9MoZjgztGs33uiy12b5fc3dSuONQOyujekyeCGTA6YymVnBrwpO98ARrP1BO hbuBfHorReLAyb1zAu7M0oFMLJWjTR7kXoXkcM4PvqRsMLBbUFb6SxVfoc7y02nr0h/D JeoQ== 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=0GLnlGSGAwBn75b0MQeaSNqtdr0OID8M1d194gsidV0=; b=PTTw/ZZz1++XbRrakLwOagLC8VZmaX88sA5t6f9/WjdctD8bIe6czvFcHrnGuXzJvZ PSSQS6mnvMYspQ1UoEewaFHxBO8HS8la35b2vTJBgi7mfbNwoP6A470Bb9yqkSEmfZMe dhlyo3lC7pWpjsv2IwSKi7giVQ4rjqlodVrZ5DmmVSOTHNqDzw5fYSHLtb1QC1x8PwFx Rzm1SKEbvZqoPS1wGdqTXE04f677RUEml6QGkSAVH+l0tYkQOJEJfCQjxZoQhcTbVx2c eM5z+zRY+tY/mSITwsg1kNKS60x+lyIKn7wTqmvYkHQijG3BEIe/tnh463nVenMo/Hl7 bEEg== X-Gm-Message-State: AOAM532Li7HZJzHKd1hgLYm+iQUpVBcjcID7bH/FUlAHpzkWh0pnBK0I JG8HoTip+gQzt4G0mm/rlnhmvvxgxd6vhg== X-Google-Smtp-Source: ABdhPJzyWqITIGoy505ySVOUzgkdhgN5OYMWBpsD8yAEhGlnp1yAPrlSE71fOCJ8IfvYQa8HrCoszw== X-Received: by 2002:aa7:cd9a:: with SMTP id x26mr34833359edv.226.1605857107984; Thu, 19 Nov 2020 23:25:07 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id lz27sm779419ejb.39.2020.11.19.23.25.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:25:07 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:19:30 +0100 Message-Id: <20201120072116.818090-58-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 v2 057/162] avcodec/mpegaudiodsp: Make ff_mpadsp_init() 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" The only thing missing for this is to make ff_mpadsp_init_x86() thread-safe; it currently isn't because a static table is initialized every time ff_mpadsp_init() is called (when ARCH_X86 is true). Solve this by initializing this table only once, namely together with the ordinary not-arch specific tables. This also allows to reuse their AVOnce. Signed-off-by: Andreas Rheinhardt --- This is needed for Musepack 7 and 8 as well as qdm2 and the MPEG audio decoders. libavcodec/mpegaudiodsp.c | 3 +++ libavcodec/mpegaudiodsp.h | 1 + libavcodec/x86/mpegaudiodsp.c | 9 ++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegaudiodsp.c b/libavcodec/mpegaudiodsp.c index 0a14ff549e..f03e244644 100644 --- a/libavcodec/mpegaudiodsp.c +++ b/libavcodec/mpegaudiodsp.c @@ -73,6 +73,9 @@ static av_cold void mpadsp_init_tabs(void) ff_mdct_win_fixed[j + 4][i + 1] = -ff_mdct_win_fixed[j][i + 1]; } } + + if (ARCH_X86) + ff_mpadsp_init_x86_tabs(); } av_cold void ff_mpadsp_init(MPADSPContext *s) diff --git a/libavcodec/mpegaudiodsp.h b/libavcodec/mpegaudiodsp.h index 28dcec576c..4c9b05ebac 100644 --- a/libavcodec/mpegaudiodsp.h +++ b/libavcodec/mpegaudiodsp.h @@ -63,6 +63,7 @@ void ff_mpadsp_init_aarch64(MPADSPContext *s); void ff_mpadsp_init_arm(MPADSPContext *s); void ff_mpadsp_init_ppc(MPADSPContext *s); void ff_mpadsp_init_x86(MPADSPContext *s); +void ff_mpadsp_init_x86_tabs(void); void ff_mpadsp_init_mipsfpu(MPADSPContext *s); void ff_mpadsp_init_mipsdsp(MPADSPContext *s); diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c index f46a5c4f3d..d646c6dbcb 100644 --- a/libavcodec/x86/mpegaudiodsp.c +++ b/libavcodec/x86/mpegaudiodsp.c @@ -239,10 +239,8 @@ DECL_IMDCT_BLOCKS(avx,avx) #endif #endif /* HAVE_X86ASM */ -av_cold void ff_mpadsp_init_x86(MPADSPContext *s) +av_cold void ff_mpadsp_init_x86_tabs(void) { - av_unused int cpu_flags = av_get_cpu_flags(); - int i, j; for (j = 0; j < 4; j++) { for (i = 0; i < 40; i ++) { @@ -256,6 +254,11 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s) mdct_win_sse[1][j][4*i + 3] = ff_mdct_win_float[j + 4][i]; } } +} + +av_cold void ff_mpadsp_init_x86(MPADSPContext *s) +{ + av_unused int cpu_flags = av_get_cpu_flags(); #if HAVE_6REGS && HAVE_SSE_INLINE if (INLINE_SSE(cpu_flags)) {