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)