From patchwork Wed Dec 30 23:31:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24722 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 CD2D844BAAA for ; Thu, 31 Dec 2020 01:37:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16C2E68A8F5; Thu, 31 Dec 2020 01:33:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF0F768A807 for ; Thu, 31 Dec 2020 01:33:02 +0200 (EET) Received: by mail-ej1-f44.google.com with SMTP id b9so23749460ejy.0 for ; Wed, 30 Dec 2020 15:33:02 -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=1KLuii1QVLUFHjGyEkjmYy+nmO4cAHzVauILrSFCYuY=; b=dw7hiEhB+fTVdSGGWcMPG7eEtNCpOSXcfvtswysCB+Iw6EMgXW3QRk23eQ0tHrV91S CsO8ZextcNz0USyZafp99uUhib2hxlJVcnaTkNvE/ZEiR6J5oKXUBm9f4rqb46OP/RYI 5t7tDOrAh3SBIwxIuoAQz/mWi9Da46OMQZIvdiU4QbQXBIprxfcHXRLRVMFO3tY07uty pJArZEr0cL2gzM1rluFmQqcq3sjONwVGAIsTkGbIz58QPf4lTf2/3brMLTpfDzHcPioB xK43B2Bu6eEbsBSSbM1iROJapYB8eXAtmrL1NfllscJiU7eY3y7yvnSWh+rISuXWg9VO RSqg== 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=1KLuii1QVLUFHjGyEkjmYy+nmO4cAHzVauILrSFCYuY=; b=nNfQfrmscEp6UxvSt3/6TdWPqsq8RRYLwa5CviuJIrmq6ogwsj2CqCSaw4Ukbv3/n1 tI+78aQpxjVBbcsnUhnunW6wvtTksyGKzF6wg03V4bbXnQTIEyMHNCf09+XRBgKOVXxV cw/B9dX/2ZKzy7T5pVRnYiEALm4BD6+qXMGPaoXm6c1KSuWMHPpxCN+s0/rud5NYI3Yz 5dRV9qVZ8yqM6LglOPvuk2TFrkh4G6gs4/+CXPHDW2oF8j/YIJuhIyDXxXuI3BGO3M02 Jn8/xXwcqwcpUVcAaccVeyi9GIHKPLtYhabVP12IyJVNXk5OW5SzmD82ksM+b3v4xzs9 MLRg== X-Gm-Message-State: AOAM531XE5ZKdFh+cUypvfKZprORM91fuvf0PG5b02/1fGY91o4h1vQh ucF/iRCUepPQEam20DI/MmgR88Zruh4= X-Google-Smtp-Source: ABdhPJxXzG3tkaC6QhGZ53KasTFDzpSdHhxX6U2YjPh/CdJ6iq7ao8ktC7ZDwH6Vt2z6Gj3vTumWJQ== X-Received: by 2002:a17:906:578e:: with SMTP id k14mr10121646ejq.90.1609371182102; Wed, 30 Dec 2020 15:33:02 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u19sm19630409ejg.16.2020.12.30.15.33.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 15:33:01 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Dec 2020 00:31:57 +0100 Message-Id: <20201230233157.1055287-30-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> References: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 30/30] avcodec/dvenc: Make encoder 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 --- The above depends upon ff_check_alignment() being removed first. libavcodec/dvenc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 21a8b841f6..35b6f71e46 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -32,6 +32,7 @@ #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "dv.h" @@ -67,8 +68,6 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) return ret; } - dv_vlc_map_tableinit(); - memset(&fdsp,0, sizeof(fdsp)); memset(&mecc,0, sizeof(mecc)); memset(&pdsp,0, sizeof(pdsp)); @@ -83,6 +82,13 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) s->fdct[0] = fdsp.fdct; s->fdct[1] = fdsp.fdct248; +#if !CONFIG_HARDCODED_TABLES + { + static AVOnce init_static_once = AV_ONCE_INIT; + ff_thread_once(&init_static_once, dv_vlc_map_tableinit); + } +#endif + return ff_dvvideo_init(avctx); } @@ -1226,4 +1232,5 @@ AVCodec ff_dvvideo_encoder = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .priv_class = &dvvideo_encode_class, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };