From patchwork Tue Mar 7 09:02:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 2784 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp463230vsy; Tue, 7 Mar 2017 01:02:47 -0800 (PST) X-Received: by 10.223.128.99 with SMTP id 90mr18509808wrk.157.1488877366995; Tue, 07 Mar 2017 01:02:46 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f141si11943716wme.164.2017.03.07.01.02.46; Tue, 07 Mar 2017 01:02:46 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B59B680D30; Tue, 7 Mar 2017 11:02:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3560A68045B for ; Tue, 7 Mar 2017 11:02:17 +0200 (EET) Received: by mail-pf0-f196.google.com with SMTP id o126so6345358pfb.1 for ; Tue, 07 Mar 2017 01:02:30 -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; bh=FKovmOfwd6NRXQ855PXHdHFv7kd94LRAWsrYQMxnsgY=; b=QDqabBuG3mvljMLNCN5GrQELtn6zVdDM6kc4W5BuSOcuMQkIir7IrtCSU5h3wfvDDe Dst5kjiJb5FlGDLxJCWBhSpYqhQLIBwInSyIbAZFrwtI8/K0M6zSicleJpIiXuC1QSWP V+LK8pMT/BjPAzhZo+6aHEZdL6yfjLpPGCNd3OEhKgHgD21elFKd2BPyObmu1h73KLXW qHtvD5C3QI8Gp0jIqaJDfr7L8kXGow5Tj33yPMHjjJjhUzL9JnLINfz1UH8XfEqgibq2 1V+pDnBz6uqu33yfgaIxdYOmkb2o2BOl0yCZ7ERdAs//CtZfjBbzhmD+6XMqKGM8OmnD 7ZkQ== 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; bh=FKovmOfwd6NRXQ855PXHdHFv7kd94LRAWsrYQMxnsgY=; b=GoWmsQIT3jZNHli8V7icX0jITiMXROOdgdthr2UO2kUXd/zlNt3ZFKeneB82CSb8IW Nt+jM3MNEmEOivhWwBPjJp3Q5z38TVKzUtghhsPaQVWKOE7+j0Dg/1q/o7ehtKAM/eET 3Rlq/GlHZUBZuqGPxlBdqLas5md7v474Ow1tPdG5qvJwdznd1bbMSosXpBP/QjJuIkRx eRs3KN6LiStGqkepMymQZNVp8ai3MVWDEOuCLHbAHNib8SKL656AyRi3TX7bTn0MJNLY Sw8rV2atER31nGIY6PdBEwL2F2vapgm6m7i6Rye6acEydfzxxP7ZXa/XUMSIaN+6m38s Zftg== X-Gm-Message-State: AMke39nf201sZ2nGoRyseY4NJ4VgjGUsDpSHPOfbiISYNWqn3Z/j4h8IByspPz+KX3BJKA== X-Received: by 10.99.143.18 with SMTP id n18mr15808235pgd.177.1488877348878; Tue, 07 Mar 2017 01:02:28 -0800 (PST) Received: from localhost.localdomain ([114.120.239.164]) by smtp.gmail.com with ESMTPSA id r134sm44360447pfr.83.2017.03.07.01.02.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Mar 2017 01:02:28 -0800 (PST) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Mar 2017 16:02:00 +0700 Message-Id: <20170307090201.11017-3-mfcc64@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170307090201.11017-1-mfcc64@gmail.com> References: <20170307090201.11017-1-mfcc64@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/4] avfilter/allfilters: make avfilter_register_all 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: Muhammad Faiz MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" use ff_thread_once Suggested-by: wm4 Signed-off-by: Muhammad Faiz --- libavfilter/allfilters.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 15a74c4..df1af8d 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/thread.h" #include "avfilter.h" #include "config.h" #include "opencl_allkernels.h" @@ -37,14 +38,8 @@ avfilter_register(&ff_##x); \ } -void avfilter_register_all(void) +static void register_all(void) { - static int initialized; - - if (initialized) - return; - initialized = 1; - REGISTER_FILTER(ABENCH, abench, af); REGISTER_FILTER(ACOMPRESSOR, acompressor, af); REGISTER_FILTER(ACROSSFADE, acrossfade, af); @@ -380,3 +375,10 @@ void avfilter_register_all(void) REGISTER_FILTER_UNCONDITIONAL(vf_fifo); ff_opencl_register_filter_kernel_code_all(); } + +void avfilter_register_all(void) +{ + AVOnce control = AV_ONCE_INIT; + + ff_thread_once(&control, register_all); +}