From patchwork Fri Nov 27 01:02:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24093 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 5968D44A448 for ; Fri, 27 Nov 2020 03:13:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 337BB68BBD0; Fri, 27 Nov 2020 03:13:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02F3868B6F8 for ; Fri, 27 Nov 2020 03:13:53 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id 3so785278wmg.4 for ; Thu, 26 Nov 2020 17:13:52 -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 :mime-version:content-transfer-encoding; bh=Dhg156vkMTkVIDHnA16T8fU1+KADd6MBFpzJSOVt5ao=; b=j4zQjwv8F1WP9smwu7TStd+7BF3+zdczo2wNYDyZoEbbTJXohGAsjrFv9qKZHJAhrG +AGs1/Su1tUd11FB5Xg6XGyd2fCv4hLOdp6CXTfMskhMeapO1s0tyXpLBU6WMtH1q6GX LnN67zV6C68ZUujB7jz3TY4TeKnF+4PvGY6pY6eAhLgrUCeJD7tpnyy1CeRb6FZpJEu9 Bd64TPzZ19EUpAxe7yhOpRjC0aegwR9lltK4YA7Hafx3h272IRqS1ZLKnfjobziqPaJz yhRF4LbeLmGeOVHg5q/C0DoKpYrKVpt2Qn1afVNdlDZC+Y7iuoBM+s44K5W0B6NausfP uSzw== 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:mime-version:content-transfer-encoding; bh=Dhg156vkMTkVIDHnA16T8fU1+KADd6MBFpzJSOVt5ao=; b=FHvskhKGgpP80LIBycN7LuoYvb0UpQI2FAYajnmrnwqhs+ke+Gbx0mP3KQRpaSSnaa /C1r8EY7JEE6cYyObcW19o1V8+ZFviGTCAcpF+vRjB7Zb4UfDhrI2dJ58tsBwy02X7Hp 2qDiwD8FxVc05f22mz9/AbibM9ILFK6zw/xSr80hx8z8/ZNuoyHBU9yZOyHob9UBUf/v 59/rRckueNk2Tk7MFD6hb8g2FhgYWUo1lLhakldGTktFtpQqSU5OCOg3l7Lm51HEoDZu ZjyqwjyDq5iWAbg5h2QWD4sNUCjb/rMZtdDGCHlFZGK2zSydLyewK30W/Zlhf2+2rjRO fRvw== X-Gm-Message-State: AOAM533SY8B+kUW2dnpeRcmk8TvDQyQGKHs5nWDd/APGJO+f35BgFT98 bAF+GT0AWOtaeG1YoNmDwtKEd8GSn1iFoA== X-Google-Smtp-Source: ABdhPJyKOEHcB+XfxZWG2t2WsxIvGBOyk7X5lrr/jRzLJ5dY0G30yxHBuzpe0uXO8n8NgExeOidDvA== X-Received: by 2002:a1c:61c5:: with SMTP id v188mr5978675wmb.141.1606439207709; Thu, 26 Nov 2020 17:06:47 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l8sm10504450wro.46.2020.11.26.17.06.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 17:06:46 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Nov 2020 02:02:10 +0100 Message-Id: <20201127010249.2724610-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/45] avcodec/pcm: Make encoders 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/pcm.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 12d1b3a2c3..8ba38c6645 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -24,8 +24,10 @@ * PCM codecs */ +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/float_dsp.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "bytestream.h" #include "internal.h" @@ -35,19 +37,22 @@ static av_cold int pcm_encode_init(AVCodecContext *avctx) { avctx->frame_size = 0; +#if !CONFIG_HARDCODED_TABLES switch (avctx->codec->id) { - case AV_CODEC_ID_PCM_ALAW: - pcm_alaw_tableinit(); - break; - case AV_CODEC_ID_PCM_MULAW: - pcm_ulaw_tableinit(); - break; - case AV_CODEC_ID_PCM_VIDC: - pcm_vidc_tableinit(); - break; +#define INIT_ONCE(id, name) \ + case AV_CODEC_ID_PCM_ ## id: \ + if (CONFIG_PCM_ ## id ## _ENCODER) { \ + static AVOnce init_static_once = AV_ONCE_INIT; \ + ff_thread_once(&init_static_once, pcm_ ## name ## _tableinit); \ + } \ + break + INIT_ONCE(ALAW, alaw); + INIT_ONCE(MULAW, ulaw); + INIT_ONCE(VIDC, vidc); default: break; } +#endif avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id); avctx->block_align = avctx->channels * avctx->bits_per_coded_sample / 8; @@ -547,6 +552,7 @@ AVCodec ff_ ## name_ ## _encoder = { \ .capabilities = AV_CODEC_CAP_VARIABLE_FRAME_SIZE, \ .sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \ AV_SAMPLE_FMT_NONE }, \ + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, \ } #define PCM_ENCODER_2(cf, id, sample_fmt, name, long_name) \