From patchwork Fri Nov 20 07:32:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23861 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 783B544B2D5 for ; Fri, 20 Nov 2020 09:46:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8643B68BCCB; Fri, 20 Nov 2020 09:34:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF59D68BC27 for ; Fri, 20 Nov 2020 09:34:14 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id y17so11480074ejh.11 for ; Thu, 19 Nov 2020 23:34:14 -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=gSeO2F148zwy9tzTU0JHXVa55YkF/QB3/zEDoukkOms=; b=Vao0bRHUpUxjekCS9K/hMVk71dxCpdF72uTLdceCL6eFP4CJ6mX38m8bOV/zBNT7np 6Bw2TI5pQQ+CHHQTqiyUd46EdDgR0a9Q20tEbYxmn/7poLOsE9SexICTRop4WIj1skqZ ytyVm+y7G3nStXRIcCU1DE9LV9smujhkU/COfY5eO4IMQnpPkWt4NGL8Cq4ZwrrjL6XM G1SJcK82o/bUiQGtJjFw1iyQpDyJilRs0FOnLOVFxKZlPbr29f3IWjHrabUmxK3d8uGZ 9XjGweW+LS+/T3viBzCaII5nANlHXyyDPfKQwqkOSk+8pRBz4+b5e9fNZZRMklbFa2On tSVA== 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=gSeO2F148zwy9tzTU0JHXVa55YkF/QB3/zEDoukkOms=; b=rVElbD9B0vAOjdevu3/+ZBXZ8lRxP0RH1WgrDW6w87pBB8PQ113LmnSd4O93j1G6U8 9sjBLoWtXj6ANO+Kb1qlgpcVDGiTbgY/935cJMkwg1bRSKvtnH6asQkil0M35BzRoXRu YBDZMgDjdfJBTmREoY6IWusVPSNXL66qayNmj1jygWQtOI+0IBt/P0GH+7Z3xquHJOwN tRejw4o//+3D9QWN45h8GMlhHMBaRPwiK2gAnIHNBBwDXngDl6UEr2+CkUacZcAeyQgv Zj89A9eGZHQcBm87gxftm3hHvkQCVlBasIFwIpmco2q5rldGd9foggxcO+o8PhSH6D3L hRMA== X-Gm-Message-State: AOAM531tG4PQISxu6dvk7mBFc9zob7l2A+bqrUfmmRuWHq0NgdEVZ6Dg FtuMwmXTpiGA5QPKwdZyl+n/P/d+7tQrrA== X-Google-Smtp-Source: ABdhPJx/SzlR4zEksHjywxdrqrLV/Aqk12odKW9JV4DiQWstZA8WBPDjZi0q/HOZSILGla58VPw/Yg== X-Received: by 2002:a17:906:7698:: with SMTP id o24mr30584370ejm.447.1605857654081; Thu, 19 Nov 2020 23:34:14 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id i13sm769110ejv.84.2020.11.19.23.34.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:32:37 +0100 Message-Id: <20201120073327.820745-13-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 112/162] avcodec/rv34: Make initializing static VLC tables 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/rv34.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index e633c348bd..13f9b609e2 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -27,6 +27,7 @@ #include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "error_resilience.h" @@ -1481,6 +1482,7 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int */ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; RV34DecContext *r = avctx->priv_data; MpegEncContext *s = &r->s; int ret; @@ -1513,8 +1515,7 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) return ret; } - if(!intra_vlcs[0].cbppattern[0].bits) - rv34_init_tables(); + ff_thread_once(&init_static_once, rv34_init_tables); return 0; }