From patchwork Wed Dec 2 04:21:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24269 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 C2976449297 for ; Wed, 2 Dec 2020 06:28:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A1BC68A0BD; Wed, 2 Dec 2020 06:23:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99896689F7D for ; Wed, 2 Dec 2020 06:23:48 +0200 (EET) Received: by mail-ed1-f65.google.com with SMTP id j14so1191349edy.3 for ; Tue, 01 Dec 2020 20:23:48 -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=zN6F9pbOVn90xbK5dC5/LHq7xbpksioG2ZpHGiWcc0E=; b=KGtdHzau0wolbXSbGGigpuRXoRvJ+97obZ9Exbu2WaTxxiDnPXFxZNmzMPDiQmbI2j M5qGKF3bV4dlZOMTgBUbWReZEkD+aodkWz7yOLUj8AIVm+t0YxXLdcsEwTtXt4uQOFzj KFQHubItgGklNweXZDwsbmgKbQ+nI+8hffxbm/LKcKfYCRohISOOTAuY6y7cLF8UQQZq jVl1aQHCxupgjjQ/YzsfXGE6g+C+9aKBZuSysVwhhq7Fuy7SZAZ/Okc1Z3GrG+r/Gfjz t5uC0bsuBJig7vrH/08d2qFFTrypSOC0Br7OrVtjHT4rKugoIT6t2MEp6S4Jfm1NSLcr f01w== 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=zN6F9pbOVn90xbK5dC5/LHq7xbpksioG2ZpHGiWcc0E=; b=P04eFQDlYh5dBk7EWV4aZqrFkyFDJI6ZrUa3Yf8MF+ip6w+jHg+0+0k/YklOkh8Bf7 l0VH9HTbJhxw4nVnhMSroGplwOEtHVdHK09TD4omMLU1uyo85vodaMp0QuawCIaNREUQ qvVtup4BCCsrrSgaQN3GmQ1MsgiE/cK9u4HaYjg9S5BtOFvW8cdXPyS1G4iUxysBtggv oq5mmNn2eTm6VJlmt9ydotQb1Ulwsci8GIcYlZAUdaOAVf5wjMrtfku74vge80KOrrLa 5nIJ49WZvyuXgjwQJsx9eSlMO4Yh4E3ju319O/uAvgMbsa0TWH19JIWAbmX/3wmxQlrn nfUQ== X-Gm-Message-State: AOAM533DgdlRF/S2sULBsq3XQOASL20L0Itjxnj28XURcS2onsuxqTzH lP52VkrlNvRQp148YaN2MoXC2FEtpUY1Dg== X-Google-Smtp-Source: ABdhPJwzWR/ITVhUnQM7OD7pUPzsP0gBoOuwjbPwOUFYTIIjDgUEPJ+qWLuyw9F7ENHKEtd/0cil4Q== X-Received: by 2002:a50:9ee6:: with SMTP id a93mr854174edf.174.1606883027819; Tue, 01 Dec 2020 20:23:47 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id mc25sm265087ejb.58.2020.12.01.20.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 20:23:47 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Dec 2020 05:21:50 +0100 Message-Id: <20201202042244.519127-29-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 163/217] avcodec/4xm: Make decoder init-threadsafe 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/4xm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 336c651d31..00a8e0b1f3 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -30,6 +30,7 @@ #include "libavutil/frame.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "blockdsp.h" #include "bswapdsp.h" @@ -245,7 +246,7 @@ static void idct(int16_t block[64]) } } -static av_cold void init_vlcs(FourXContext *f) +static av_cold void init_vlcs(void) { static VLC_TYPE table[2][4][32][2]; int i, j; @@ -987,6 +988,7 @@ static av_cold int decode_end(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; FourXContext * const f = avctx->priv_data; int ret; @@ -1014,13 +1016,14 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_blockdsp_init(&f->bdsp, avctx); ff_bswapdsp_init(&f->bbdsp); f->avctx = avctx; - init_vlcs(f); if (f->version > 2) avctx->pix_fmt = AV_PIX_FMT_RGB565; else avctx->pix_fmt = AV_PIX_FMT_BGR555; + ff_thread_once(&init_static_once, init_vlcs); + return 0; } @@ -1034,4 +1037,5 @@ AVCodec ff_fourxm_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };