From patchwork Wed Dec 2 04:21:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24238 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 9EE4344A255 for ; Wed, 2 Dec 2020 06:23:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81F61689B7E; Wed, 2 Dec 2020 06:23:31 +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 C2718689BC9 for ; Wed, 2 Dec 2020 06:23:24 +0200 (EET) Received: by mail-ej1-f65.google.com with SMTP id pg6so666207ejb.6 for ; Tue, 01 Dec 2020 20:23: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:reply-to :mime-version:content-transfer-encoding; bh=H5Pnp+MkWxK6ms29xZv3gHoSWqp0GdsRS2+dD2tF5XI=; b=N+raEg8laOKIqV0YRD7ui4s6hOGHEWQnCXZKoOepVBPKu7kWd0pRuzatuvnBJSGzlg XPAumFJXIxd8ItyazYxzbxKnKg4AdVoc8N50AT6xwovmAM2X9iRDza9tNbVvnAhV4WLu A0C2uNutlxj3wxAHg1RDWF+WVi4Pih3waox0NreuYI385pnqcPAWkLsEajAKQLpBFpjC pZCTF5ZA5iNU8h+7meJwXr2aRxBAHMW+fpLFRsA0pdtncu2jGaJqWBZP3dzxxRgb8NQW HSnL/2YUsG9BPg2KB05E/nWsJLC3k/8yE6KN/uk3t3SqxYTWxkaBJzn/PmsqfizzUzl/ gX3g== 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=H5Pnp+MkWxK6ms29xZv3gHoSWqp0GdsRS2+dD2tF5XI=; b=F2A8o2JX957egGovaNzhmMROvzisy/ZPcEfuDtWNJ94xrgYm0Uqsi0x0CjoMiMqOi7 TmRi2OFZVSYR9DL0KMVVzX2LcZfgHXxrafHzk4WwtCZ30p8dMAa85TJ2tOUdUfMSEyFz c+3BwOOspOPVBo9zTYpPxFoLYXm2ZcCI43ZRcojuMmUPyUYOaIOWz2AkWdEVjt3nHcpx jhqFEKWbNicpNnWYPVWMUPKYZ65rzgAFjOegTBn82O4BghIUQTkaOhqLR/Q9GAmqm72A TvWuq39BcUpQkMQtFl7LnhOUHBJFqle45xj1UvY+dg3tdiF4J+fb8n0nbJGijn4r7HY3 PC6Q== X-Gm-Message-State: AOAM532UTuP4bYy4r3nfo/5eQ9/cbDLNx4O/lCe6b721bpb/qjZaLyiG jj4vJFOv1zsmaSRtibV/Pq1DOU/RSYrSDA== X-Google-Smtp-Source: ABdhPJyUd8LRxwyvEmGYmXJVZice5ExMAuioIoqsAvCATj3MUuViVB4OOzI7V2A5qDEthtmHeWRBjQ== X-Received: by 2002:a17:906:9888:: with SMTP id zc8mr591439ejb.42.1606883004115; Tue, 01 Dec 2020 20:23:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 20:23:23 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Dec 2020 05:21:27 +0100 Message-Id: <20201202042244.519127-6-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 140/217] avcodec/cook: 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/cook.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/cook.c b/libavcodec/cook.c index f552a57415..60b6bd6c19 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -44,6 +44,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/lfg.h" +#include "libavutil/thread.h" #include "audiodsp.h" #include "avcodec.h" @@ -1051,6 +1052,7 @@ static void dump_cook_context(COOKContext *q) */ static av_cold int cook_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; COOKContext *q = avctx->priv_data; GetByteContext gb; int s = 0; @@ -1229,7 +1231,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) } /* Generate tables */ - init_pow2table(); + ff_thread_once(&init_static_once, init_pow2table); init_gain_table(q); init_cplscales_table(q); @@ -1281,7 +1283,7 @@ AVCodec ff_cook_decoder = { .close = cook_decode_close, .decode = cook_decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };