From patchwork Fri Nov 20 07:32:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23879 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 73854449298 for ; Fri, 20 Nov 2020 09:49:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A07668BD1F; Fri, 20 Nov 2020 09:34:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0520968BD04 for ; Fri, 20 Nov 2020 09:34:34 +0200 (EET) Received: by mail-ej1-f65.google.com with SMTP id f20so11519342ejz.4 for ; Thu, 19 Nov 2020 23:34:34 -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=aY8omiRdr4hZ40WZs+m5ZhHstJNAyYnKgoizHqNNEbM=; b=qpUfmlCPPdasfCyiuqRq+PV1MtcmUpUi9Dy6rzZAbhnZLU5z0RVeS4BOOyaHmxhmHm cPV8ez8tIxkJJeQM+6tgpctzo6q2ZOA4lNkiRp/SRu9qw7H6gL70/sMmU1oEgDvzMTAk EygOF/1wSl6kZFAyW0z/2mf576usg/PwjmEMKT1+3yPdeaO7qJ/XCAyRDEeqBwSRaXkj PrER4wZX9EWL7tn0lA7FXJP5LaAAqB9umNw2+VKkhUvJnu7OjKVwWADwW1JtVsBchKCg +A2Wy7PP2TdRlgmNY73lOTwJWE2Xb56qmd3Cp4PTsaNqBR2+6udWUTM7LUPrqrEjTkWv RmKA== 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=aY8omiRdr4hZ40WZs+m5ZhHstJNAyYnKgoizHqNNEbM=; b=oyTytiYopBvxuguMfIfbMrx0tF/4D8sFNWAavEXFEaIQAF05LtVVLCQDQiXHvsjHAO XBtl1D1pchDtFA2ZBCn0qRcWJbbcqvGv5eXJOl0PvYGB5nfeqRKWlB7otM1bExEmRCTO vlFBqTKXBuaNZ/rh7wG5qmiq+EBYhZPnWpUdleeCElNIEbsGKK6q48kHdYfoaxvLv1ra dz4EV6evx5YoGUD1Ion8n70qkJXon93OHzVWi7sZHM65uvugh0XI5hF75D6quOCV7mJf otK3+bKAP0p0WfQ4SG70G3MzTExfW1TIfZUHJQS3wVYu3Dee7wzuMYRa0k4XaiHoi08N IWMQ== X-Gm-Message-State: AOAM530yhepQhFYJPHBXC07mk2SCRRdgd6DDGRNrYnpJLNi0PorRPPJZ S4cQK0EPdwOXbyLj0lnyThPvuPE6/Or4DA== X-Google-Smtp-Source: ABdhPJynDete/Q19gQD1AAkP6vNo0glEpaenhvnj8yFkP6nxRen+nCvy+6c8tP4v8EkVj6ClQ1rAkQ== X-Received: by 2002:a17:906:7c95:: with SMTP id w21mr9018628ejo.304.1605857674188; Thu, 19 Nov 2020 23:34:34 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:33 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:32:55 +0100 Message-Id: <20201120073327.820745-31-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 130/162] avcodec/intrax8: Make ff_intrax8_common_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" In particular, don't reinitialize VLCs every time an IntraX8Context is initialized. Signed-off-by: Andreas Rheinhardt --- libavcodec/intrax8.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index b62bff3b48..0bd0db29c4 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -22,6 +22,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "get_bits.h" #include "idctdsp.h" @@ -696,6 +697,8 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, int block_last_index[12], int mb_width, int mb_height) { + static AVOnce init_static_once = AV_ONCE_INIT; + w->avctx = avctx; w->idsp = *idsp; w->mb_width = mb_width; @@ -723,7 +726,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, ff_intrax8dsp_init(&w->dsp); ff_blockdsp_init(&w->bdsp, avctx); - x8_vlc_init(); + ff_thread_once(&init_static_once, x8_vlc_init); return 0; }