From patchwork Fri Nov 27 01:02:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24091 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 83D73449584 for ; Fri, 27 Nov 2020 03:12:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 56B1A68B9CB; Fri, 27 Nov 2020 03:07:37 +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 EAA4668BB9F for ; Fri, 27 Nov 2020 03:07:24 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id a3so4455709wmb.5 for ; Thu, 26 Nov 2020 17:07:24 -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=y1RHCoh7M8sWJ1qmOkbs+5KMtRE8ETn4tuJVx+OdVts=; b=SwNQnjaDN760KYyndzCW7PgEQk5McQqTOFRZVIKYA+PTIbHVCcNkVmi+akhHEag1YH YWRfxj8qcCMBzKluIFxgSmI2jk2Iqzlfp7QbTfXpb4PXUmeec+G3RbgJdK8PPtePKf0C t9mJK372KYHDTLmEzqGiyIq6w+ZAXlXlw0T4pW9JZpTof84wkGzqjc7+EsyC45lTW2k7 vZ8v8DhO6HPGV7Xlmz/wywztgPvLgupDP/6TNIL5tb0V7eUJLKjlTRhxvbyyebFPgrCM AeoXKqDMKz9K9jcsLhXBaGhBrrUqar+TJxNK/Cen1rOTgcHEFu8VNTDB9FDsjw2Mtrlw AX4g== 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=y1RHCoh7M8sWJ1qmOkbs+5KMtRE8ETn4tuJVx+OdVts=; b=neYyrBkV+Cn0W6usSVDivSVoxqoY2RIfF1CDPc4jGuXc7WyaULP0k//tsy+LGBfu5E wICI7GJrof/Eobmknjy1ii6LL5bJTp7PwoXTzuoCzlU6wpCeoVhq7mfFAhL/IwpgiEh6 m9ViCM6Et3OngFw93yGtAO60lGSP/da+lSW6iTjITxkX1K4NUEDemXA4AVx00dslHBQD h7gFrq/B9FL4x6lMTWa27HF809hyBDEPUX8WK6i9hnjmneE+zXZYKEBTLw3k7M53yHfN avTrveDhumrGsK8GRTunYhHqxaHpoM0jl17dzlAnJ+roUFBt44VWQDrqQMDe7WrDTu45 LjeQ== X-Gm-Message-State: AOAM531O9VQasSEDZiD+cyZblZwfyTfazkX7KVaYuxoLFORT77tWUIPy h75Pc5iLJZzYYIiGiu25eXDq+WDAF77gAg== X-Google-Smtp-Source: ABdhPJzCWfP7S/wGYkqokV6fkriZ7vj3UDKalfodHJJvI2MQiN8e5bexghpCVx+FQOVXhezPfKfnog== X-Received: by 2002:a1c:61c5:: with SMTP id v188mr5980998wmb.141.1606439244274; Thu, 26 Nov 2020 17:07:24 -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.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 17:07:23 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Nov 2020 02:02:47 +0100 Message-Id: <20201127010249.2724610-43-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 43/45] avcodec/faxcompr: Make ff_ccitt_unpack_init() 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" This will allow to make the TIFF decoder's init function thread-safe. Signed-off-by: Andreas Rheinhardt --- libavcodec/faxcompr.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index 2a1d2bc3f6..3dd64cf730 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -24,6 +24,7 @@ * CCITT Fax Group 3 and 4 decompression * @author Konstantin Shishkov */ +#include "libavutil/thread.h" #include "avcodec.h" #include "get_bits.h" #include "put_bits.h" @@ -96,15 +97,12 @@ static const uint8_t ccitt_group3_2d_lens[11] = { static VLC ccitt_vlc[2], ccitt_group3_2d_vlc; -av_cold void ff_ccitt_unpack_init(void) +static av_cold void ccitt_unpack_init(void) { static VLC_TYPE code_table1[528][2]; static VLC_TYPE code_table2[648][2]; int i; - static int initialized = 0; - if (initialized) - return; ccitt_vlc[0].table = code_table1; ccitt_vlc[0].table_allocated = 528; ccitt_vlc[1].table = code_table2; @@ -119,7 +117,12 @@ av_cold void ff_ccitt_unpack_init(void) INIT_VLC_STATIC(&ccitt_group3_2d_vlc, 9, 11, ccitt_group3_2d_lens, 1, 1, ccitt_group3_2d_bits, 1, 1, 512); - initialized = 1; +} + +av_cold void ff_ccitt_unpack_init(void) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + ff_thread_once(&init_static_once, ccitt_unpack_init); } static int decode_uncompressed(AVCodecContext *avctx, GetBitContext *gb,