From patchwork Sat Nov 21 12:17:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23931 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 C4F42449836 for ; Sat, 21 Nov 2020 14:18:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A182568BA12; Sat, 21 Nov 2020 14:18:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3503A68B93B for ; Sat, 21 Nov 2020 14:17:56 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id 64so227293wra.11 for ; Sat, 21 Nov 2020 04:17:56 -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=S0YWhwa/gWfz053yaU/3ZCu5pAA06+rdApYHJp13LPs=; b=JHCqdbv+SHTxWQvkTq/9sfahldUzPTVzu5ZfCcgfih8G4423zqo+zpsyqQj/dKYNfb ezFcRgtZWT7e1v/pCqfdg8WSJyrtShRoGp37WxG1T59CVMzTRPCdv9BQCYVWaZCpwWan Hl6Y/lgG+44ZNkNkovxNW6mGnrTf0pC0Z66kosUtln3qo7M/6QKNaKH/rCsj4R42TaQ8 rdGDX8Gqc9l0eJFP4wXJZ3O3Y19yZPEg60O5KCF+nwg8/DpwJLmzxLs2ho3oYNVtqV+7 oJtMPIAocrNdm9gRf91cwhFSE6Z4pLA+9Rh/hEenu+lITzQgvheaPlZt2jC1KlC7elz3 hzIw== 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=S0YWhwa/gWfz053yaU/3ZCu5pAA06+rdApYHJp13LPs=; b=Hna6uYow2oCYTeD+sj5tOE9Pi1Grp0rgxCCQm/F99T5+xW+gZuQ1Pd4xdESSCgj7UJ kgX+rtWFvWS7pm6zSGNW6oAbDrM6cOXahDHrL0CDBtvdXuAPdGWq82WZkh0G6DaeNzd2 g+U865PEc20Y27/mLJydG/ku03GUCTzW0tuHl0GLCloVl6UHv/ghhX+OjxZAsttHa4ip oDJTBOm086qpzs3Y0SEEr0681M1RTNGiGkGUo6xpVH24L+wjXDm5R4IX1c/5XU3zA1q1 ezPcRAWjC5DNhR8fZdLcco9ZPlnn1z6Z7+tSqInOhndB3YpiQO+3f4DtC8oBAa6W6Khf zXqg== X-Gm-Message-State: AOAM531ePRQOZHadVNvZb1GZhv1/RlGafMMw3+kD73BvvdE44HLC+gy6 rYKEbFUJ7HCHFLeSUtTX/0OuSjPrHtKiwA== X-Google-Smtp-Source: ABdhPJx+gNdZU8e3df64jQJzrFRIjUzB4M4hJNn1WDMhQhYVjjJ6u50ZjHXvwUPJzcm+hLwEmKs9+Q== X-Received: by 2002:adf:916e:: with SMTP id j101mr14953214wrj.55.1605961075429; Sat, 21 Nov 2020 04:17:55 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id 9sm4586092wmo.34.2020.11.21.04.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Nov 2020 04:17:54 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Nov 2020 13:17:27 +0100 Message-Id: <20201121121728.1018014-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201121121728.1018014-1-andreas.rheinhardt@gmail.com> References: <20201121121728.1018014-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/mlpdec: Make decoders 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/mlpdec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 1a2c0f29ac..ec346868c6 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -30,6 +30,7 @@ #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/channel_layout.h" +#include "libavutil/thread.h" #include "get_bits.h" #include "internal.h" #include "libavutil/crc.h" @@ -205,7 +206,6 @@ static VLC huff_vlc[3]; static av_cold void init_static(void) { - if (!huff_vlc[0].bits) { INIT_VLC_STATIC(&huff_vlc[0], VLC_BITS, 18, &ff_mlp_huffman_tables[0][0][1], 2, 1, &ff_mlp_huffman_tables[0][0][0], 2, 1, VLC_STATIC_SIZE); @@ -215,7 +215,6 @@ static av_cold void init_static(void) INIT_VLC_STATIC(&huff_vlc[2], VLC_BITS, 15, &ff_mlp_huffman_tables[2][0][1], 2, 1, &ff_mlp_huffman_tables[2][0][0], 2, 1, VLC_STATIC_SIZE); - } ff_mlp_init_crc(); } @@ -279,15 +278,17 @@ static inline int read_huff_channels(MLPDecodeContext *m, GetBitContext *gbp, static av_cold int mlp_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; MLPDecodeContext *m = avctx->priv_data; int substr; - init_static(); m->avctx = avctx; for (substr = 0; substr < MAX_SUBSTREAMS; substr++) m->substream[substr].lossless_check_data = 0xffffffff; ff_mlpdsp_init(&m->dsp); + ff_thread_once(&init_static_once, init_static); + return 0; } @@ -1339,6 +1340,7 @@ AVCodec ff_mlp_decoder = { .init = mlp_decode_init, .decode = read_access_unit, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_TRUEHD_DECODER @@ -1351,5 +1353,6 @@ AVCodec ff_truehd_decoder = { .init = mlp_decode_init, .decode = read_access_unit, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif /* CONFIG_TRUEHD_DECODER */