From patchwork Sat Nov 21 12:17:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23930 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 9132C449836 for ; Sat, 21 Nov 2020 14:17:43 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 691E068BA0D; Sat, 21 Nov 2020 14:17:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D6EB68B93B for ; Sat, 21 Nov 2020 14:17:37 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id 64so226820wra.11 for ; Sat, 21 Nov 2020 04:17:37 -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:mime-version :content-transfer-encoding; bh=MPj4dYQhmvJBdvtDFgUOWfFLWs6U3K8R8HN5JoR4Aho=; b=oHwPOCSjKKPL4WFdCIppDbckG5kExH5yklaWYvT2HzUHgK1ESbIEEmEifeczPQNySb Im6IE6Xt4NRcKs5obwzwI7XSS6NAkJacDDGWrXS5jz29umL26g+B3GMxzBw1M2FRU395 0S3SGwn87YjeS3QKSuIPjYc08atnTd0/tKJuaEG1h16i6UukMa1RlV7+gFVcqOjj54ku mXsFSsf7BBBCG5ka1tIIpkbYNZxxTJYa7et7ZL/TFAe/mecz2BohLo8irueUNPTz3FPO 6ehnkwBEPJXIwcEG46gi79sgbp775XfeWqtllonhQXnMMvo0XDtX2JqBxQI3+fN9JAWB EyMQ== 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:mime-version :content-transfer-encoding; bh=MPj4dYQhmvJBdvtDFgUOWfFLWs6U3K8R8HN5JoR4Aho=; b=YlZI6JWjmMxQjUqeDZFF+dvVtU9UEq9gi8c5U0sdE6niRweRHapdRZczmWDOJBJmPs a5e3Ot0itJp01woShyxOa0c21p/hmHnm6J80Ljl3L9BSuML2a9JhJdoj/uBN7hKI58Vn 311qb6PX2M1Cc0PsZFAip/vG7f9JIEH+m0y2K5GxPaEF/xES9DXa3EImHcrOLpgxOgHt V4msJr2MGSktGWBx4doSHCePT8F7y5Odb67yfYgYs1KBXG/gbzVLfU3948tVV0blxWMn 8+vjpJSg1hhFaVUrF9FYKF61/rhKAauEyeamyWiP0Ww5GClVf0bWwFfLVn1Ad5aUBjEq curA== X-Gm-Message-State: AOAM532krdKNRv8O89eYWH0fwv6u6zEhAnunDta0/W16m0y/mdCl2Rhf 3QEQqjXq8QaEPW25bp9/efEybox5hJvxqQ== X-Google-Smtp-Source: ABdhPJwkfOzTPHfr52p93fu+A8Cxbp99g2kVgZFvERwe/kN+qs7hvE0Kwd+khAJeU53hRZHvjdWdIg== X-Received: by 2002:a5d:4e4c:: with SMTP id r12mr21180787wrt.348.1605961056475; Sat, 21 Nov 2020 04:17:36 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Nov 2020 04:17:35 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Nov 2020 13:17:26 +0100 Message-Id: <20201121121728.1018014-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/mlp: Make initializing CRCs 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/mlp.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavcodec/mlp.c b/libavcodec/mlp.c index ddbab60c4e..74363c3b95 100644 --- a/libavcodec/mlp.c +++ b/libavcodec/mlp.c @@ -23,6 +23,7 @@ #include "libavutil/crc.h" #include "libavutil/intreadwrite.h" +#include "libavutil/thread.h" #include "mlp.h" const uint8_t ff_mlp_huffman_tables[3][18][2] = { @@ -62,7 +63,6 @@ const uint64_t ff_mlp_channel_layouts[12] = { AV_CH_LAYOUT_4POINT1, AV_CH_LAYOUT_5POINT1_BACK, 0, }; -static int crc_init = 0; #if CONFIG_SMALL #define CRC_TABLE_SIZE 257 #else @@ -72,14 +72,17 @@ static AVCRC crc_63[CRC_TABLE_SIZE]; static AVCRC crc_1D[CRC_TABLE_SIZE]; static AVCRC crc_2D[CRC_TABLE_SIZE]; +static av_cold void mlp_init_crc(void) +{ + av_crc_init(crc_63, 0, 8, 0x63, sizeof(crc_63)); + av_crc_init(crc_1D, 0, 8, 0x1D, sizeof(crc_1D)); + av_crc_init(crc_2D, 0, 16, 0x002D, sizeof(crc_2D)); +} + av_cold void ff_mlp_init_crc(void) { - if (!crc_init) { - av_crc_init(crc_63, 0, 8, 0x63, sizeof(crc_63)); - av_crc_init(crc_1D, 0, 8, 0x1D, sizeof(crc_1D)); - av_crc_init(crc_2D, 0, 16, 0x002D, sizeof(crc_2D)); - crc_init = 1; - } + static AVOnce init_static_once = AV_ONCE_INIT; + ff_thread_once(&init_static_once, mlp_init_crc); } uint16_t ff_mlp_checksum16(const uint8_t *buf, unsigned int buf_size) 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 */ From patchwork Sat Nov 21 12:17:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23932 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 8315D449863 for ; Sat, 21 Nov 2020 14:18:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C2A868B93B; Sat, 21 Nov 2020 14:18:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15CCF68B93B for ; Sat, 21 Nov 2020 14:17:57 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id t4so697392wrr.12 for ; Sat, 21 Nov 2020 04:17:57 -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=o7BLwDVPB97/07j9J8FU3UdgPx5TJw8+IFF5+GqAQ8s=; b=r7uAeM95CyYWrILbiAU5ic87meq7oiuWng5bJjMlXa3jH/tFVCH4T5d2qRlUQcSE0v ty0RpWa6pYWpNRA1hJNzqVaIuYL8Zwq2/jFqJ2ii7W8FWdn/EpMIy+UkzN8CqD7nrMQY j9xptbqsqjgS1O6FdR5/FwMH+ZH3LrmvFfIN/DUfSdCIsRGP8xuj3Nb6r1+kG1vI2bkv A789h/xOVWK8cOtePatjiPnRN5aeU2RzWqzha9FKIFdrDur72rOvic/FFGf592yTVq0G 6RUjKow76jXPCCSN6DvhzPjhSRru8BvmWiD23eusFji5dTbVrCPo3eHGdCeK4OKgF/cL ileg== 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=o7BLwDVPB97/07j9J8FU3UdgPx5TJw8+IFF5+GqAQ8s=; b=qAyUfcVXe/23/ZAmSLg8siKF2xrK2pYPS8/NAgRZkobH1yi2y3Xq5xGJYZMWCYbJUX o8Rl8XAk3ToUv+RUnCb/sJln3tprustRQSaSHh9XNNV06YI+R7jbx9twI5KqcLEE+hio VqTgzimpiu6+I9Jkloqir+X6gNciWok7Nya/Ds4BM61RvRVe5okVkL3Uhqu4uXLtV24T Qgt14CIhxrwXgEpJz9u76zALxqiO33D4Nmic9nlwCT0sj+4IQe5JxRKn+L+7W6WbOKTc fnH+iMRHZ7dptWJhKmokymIBl0ioOrhv/YdJmWiDmNEKqM1HG87nA28yI321kjOnyz8k 2NyQ== X-Gm-Message-State: AOAM530P+Sx/olXreA6bsssoE42vKQG618hj/ev9AGTfkSzNDqOe/x3T dSlDLfhft0FWeyyfuF8Ctu9Be4xtEyg+XA== X-Google-Smtp-Source: ABdhPJxWlhCu64H2tIQRfHlhqKmqPOM80ZS4jBeBBgXT9qEGepz1Apy0lg8eNLrzK9XC6jLLsFd8Yg== X-Received: by 2002:adf:fe46:: with SMTP id m6mr22609892wrs.254.1605961076425; Sat, 21 Nov 2020 04:17:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Nov 2020 04:17:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Nov 2020 13:17:28 +0100 Message-Id: <20201121121728.1018014-3-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 3/3] avcodec/mlpdec: Avoid code duplication when initializing VLCs 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 | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index ec346868c6..ed25b71d2d 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -206,15 +206,14 @@ static VLC huff_vlc[3]; static av_cold void init_static(void) { - 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); - INIT_VLC_STATIC(&huff_vlc[1], VLC_BITS, 16, - &ff_mlp_huffman_tables[1][0][1], 2, 1, - &ff_mlp_huffman_tables[1][0][0], 2, 1, VLC_STATIC_SIZE); - 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); + for (int i = 0; i < 3; i++) { + static VLC_TYPE vlc_buf[3 * VLC_STATIC_SIZE][2]; + huff_vlc[i].table = &vlc_buf[i * VLC_STATIC_SIZE]; + huff_vlc[i].table_allocated = VLC_STATIC_SIZE; + init_vlc(&huff_vlc[i], VLC_BITS, 18, + &ff_mlp_huffman_tables[i][0][1], 2, 1, + &ff_mlp_huffman_tables[i][0][0], 2, 1, INIT_VLC_USE_NEW_STATIC); + } ff_mlp_init_crc(); }