From patchwork Mon Nov 30 00:54:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24171 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 9917344A277 for ; Mon, 30 Nov 2020 02:58:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85B83689B6C; Mon, 30 Nov 2020 02:55:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F245689751 for ; Mon, 30 Nov 2020 02:55:43 +0200 (EET) Received: by mail-ed1-f68.google.com with SMTP id u19so12044236edx.2 for ; Sun, 29 Nov 2020 16:55:43 -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=9wFykxcyM2278/R5YxWD+SrmizSU0LTMTb4cEcgMLcM=; b=nuBJU8/qvs3UdUkMUk29JbfxqHfpv3lUpzyIH66Xi8chAUMksDYEwTmyRnLpNH1uel mQQ+AOKFwNp52FMeqjHk0YlL2MQyfy0+oT8DTCTY8uN+OfcX+SxOBtgjLtUT95b2rQBO IHoyjkbG7UT6HF5EVT6ZlRGpIMJUBpe4RmvWNtb5ru9PbZFqtHPdq8ne7sLa4Snrqy9u 9V/gr3FR+ne9dviSdvCQnCpGJfPMavIfxqraMxDZIbA/8vOsUO9NpDvnrcx4pFF/6OLo TQpP5LU1qTBqzqMnzbodWX47wZF3c6gLcrs3xv4c/F5MIZI0tlV/AyxGsnk4LQyIY8aT Voxw== 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=9wFykxcyM2278/R5YxWD+SrmizSU0LTMTb4cEcgMLcM=; b=g3+knoV4FYsoM/mrDC1vyp0jVFNsDOrF4xRQMpi3OTMQZ5yMv+Vs2Wgi9TSUCks4oc O7XFDzsRCnUFgq0vEMYIZydE8WVuGSzOJaRIGrIFGO2sySd44rFEp0C3sFIdH8XuYplM e+nyseqBpJqNBH5cq5oFPDgIQ+RS1xz7NBK1iOPFvZ2PrCLv76C/+tJrrA54wkuqHlMD 8M417lAYwMxwXANLzKhDj0Bi7JPlmxpybHCMDSv/kuaEiwdEzMfng7qWrcZyD+w/4xbd EFF6Ch7gw+r3agVsL8diN8St+e3VJNcZMIcGKdeVKcOITZAH+7BeoFilP7lz1lpX4xvP 6A/A== X-Gm-Message-State: AOAM531pFX3KOIa2fi1BTZfT1gJEak9Mx7yfzeF7QrRophjbG5KscPKK vkNPWVl32kuKqF49x7LTZ8GYlaam57EvCg== X-Google-Smtp-Source: ABdhPJzAxBlimWh2eGkY5fbMGGEyIffrxzbKPjqmW7HCL7p2lI6mkSq01mN2KxGkYsA8T4KNrf7GbQ== X-Received: by 2002:a05:6402:cb4:: with SMTP id cn20mr19868626edb.186.1606697742375; Sun, 29 Nov 2020 16:55:42 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id b20sm3354993eja.30.2020.11.29.16.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Nov 2020 16:55:41 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Nov 2020 01:54:12 +0100 Message-Id: <20201130005454.110441-20-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 092/134] avcodec/interplayacm: 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/interplayacm.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c index 3704d1a2f2..f8ae39dea8 100644 --- a/libavcodec/interplayacm.c +++ b/libavcodec/interplayacm.c @@ -19,6 +19,7 @@ */ #include "libavutil/intreadwrite.h" +#include "libavutil/thread.h" #define BITSTREAM_READER_LE #include "avcodec.h" @@ -54,10 +55,25 @@ typedef struct InterplayACMContext { int *midbuf; } InterplayACMContext; +static av_cold void decode_init_static(void) +{ + for (int x3 = 0; x3 < 3; x3++) + for (int x2 = 0; x2 < 3; x2++) + for (int x1 = 0; x1 < 3; x1++) + mul_3x3[x1 + x2 * 3 + x3 * 3 * 3] = x1 + (x2 << 4) + (x3 << 8); + for (int x3 = 0; x3 < 5; x3++) + for (int x2 = 0; x2 < 5; x2++) + for (int x1 = 0; x1 < 5; x1++) + mul_3x5[x1 + x2 * 5 + x3 * 5 * 5] = x1 + (x2 << 4) + (x3 << 8); + for (int x2 = 0; x2 < 11; x2++) + for (int x1 = 0; x1 < 11; x1++) + mul_2x11[x1 + x2 * 11] = x1 + (x2 << 4); +} + static av_cold int decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; InterplayACMContext *s = avctx->priv_data; - int x1, x2, x3; if (avctx->extradata_size < 14) return AVERROR_INVALIDDATA; @@ -84,17 +100,7 @@ static av_cold int decode_init(AVCodecContext *avctx) s->midbuf = s->ampbuf + 0x8000; avctx->sample_fmt = AV_SAMPLE_FMT_S16; - for (x3 = 0; x3 < 3; x3++) - for (x2 = 0; x2 < 3; x2++) - for (x1 = 0; x1 < 3; x1++) - mul_3x3[x1 + x2 * 3 + x3* 3 * 3] = x1 + (x2 << 4) + (x3 << 8); - for (x3 = 0; x3 < 5; x3++) - for (x2 = 0; x2 < 5; x2++) - for (x1 = 0; x1 < 5; x1++) - mul_3x5[x1 + x2 * 5 + x3 * 5 * 5] = x1 + (x2 << 4) + (x3 << 8); - for (x2 = 0; x2 < 11; x2++) - for (x1 = 0; x1 < 11; x1++) - mul_2x11[x1 + x2 * 11] = x1 + (x2 << 4); + ff_thread_once(&init_static_once, decode_init_static); return 0; } @@ -630,6 +636,6 @@ AVCodec ff_interplay_acm_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(InterplayACMContext), };