From patchwork Mon Nov 23 19:37:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23998 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 8EAAE44A49B for ; Mon, 23 Nov 2020 21:38:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73CE868BC5C; Mon, 23 Nov 2020 21:38:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC08268BBF2 for ; Mon, 23 Nov 2020 21:38:21 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id m6so19781341wrg.7 for ; Mon, 23 Nov 2020 11:38:21 -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=nIm7YX5KC93u7WaitW+K6I/HutbIhm4Id9kyks3QfnU=; b=LDyJSpQBps/jCxejX4v3khfw4TzByUlfrGGbYllDPuGABYhaANBAMOWRUqqDL3nWGT k27P9MGN1HH/q7jBhJZRhk0QjkG/6CSplPvf7q/Ovt8YJxoEsW3FZz+c7vsUA+PAYNP5 /7srxDzuFKY3vxPQjBfJsMoXW5OoWYVNrl2clvl8z5khmjEKzcebLJgfCbyatb27UHT6 z9TLDOS4U9KWSOveXIDhYqVjLXJ4Ybdx0q1wu+Mgl9GZVI7rP6yijYGTbIZSWCaGkG60 B8Xukh/Wwv+h0A4JH7qx3EXNsHmYwuL6uEP09TB4bwo4FZw9sLUz5pxsFrwMzBLmHOUf FTmg== 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=nIm7YX5KC93u7WaitW+K6I/HutbIhm4Id9kyks3QfnU=; b=cgYAfDEosiOtzO+9bExEF7c1xHzRqZ3e7T1eJoZL7L6lK4168/T0JTTqaE+292WNkX inYt6MBpvbMiKfzfkReAW93QfXjCazHwqXuuJUZSDpqJUZpjLjRbLNNJePKjTe5yQRMk NR6Hk32TFbStCDA69XU6n/moN0ekEcnXDnZo4leDHT0MR5wdrQd+/wtKYYPhPCYiijnw KAPRL/t0DnSXhZB5VR12chWleHSfKYNx2z8jfWralayzxFHhSNsfzIv6Wp4PP6bncxwE wyzla8diUYthI6Z8jtym3Y0ptIHjx1pQWdKHEoUlNElNyRTFS8clUPerk9fV56HHfupz TnDQ== X-Gm-Message-State: AOAM532hDvCN8pDDYPGJRElqxd/AWk4s32zTwRqK80mWCBz1qhMXGlT0 h/6BFgLElAog6l7SwPsql/avTDyRqVxA1Q== X-Google-Smtp-Source: ABdhPJz15xVD+9xIg4Lzo2tCOv0ojNFP2fzfMaRXppkLs+WNJc92Pxao0OCBgGST/eJOwzx5Y3RZ1Q== X-Received: by 2002:adf:e387:: with SMTP id e7mr1258251wrm.177.1606160301062; Mon, 23 Nov 2020 11:38:21 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e6sm564086wme.27.2020.11.23.11.38.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:38:20 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:26 +0100 Message-Id: <20201123193739.1249300-16-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 178/191] avcodec/mpeg12: Make initializing VLCs 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" This automatically makes the eamad, eatqi and mdec init-threadsafe. Signed-off-by: Andreas Rheinhardt --- libavcodec/eamad.c | 1 + libavcodec/eatqi.c | 1 + libavcodec/mdec.c | 1 + libavcodec/mpeg12.c | 15 ++++++++------- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 7f28abbafe..9dccddd6d3 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -349,4 +349,5 @@ AVCodec ff_eamad_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 96536b1a08..456bd3c563 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -189,4 +189,5 @@ AVCodec ff_eatqi_decoder = { .close = tqi_decode_end, .decode = tqi_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index b16cbb6a79..d0bb1162b6 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -258,4 +258,5 @@ AVCodec ff_mdec_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index e4f007aec5..e5c611414b 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -30,6 +30,7 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/timecode.h" +#include "libavutil/thread.h" #include "internal.h" #include "avcodec.h" @@ -134,13 +135,8 @@ VLC ff_mb_ptype_vlc; VLC ff_mb_btype_vlc; VLC ff_mb_pat_vlc; -av_cold void ff_mpeg12_init_vlcs(void) +static av_cold void mpeg12_init_vlcs(void) { - static int done = 0; - - if (!done) { - done = 1; - INIT_VLC_STATIC(&ff_dc_lum_vlc, DC_VLC_BITS, 12, ff_mpeg12_vlc_dc_lum_bits, 1, 1, ff_mpeg12_vlc_dc_lum_code, 2, 2, 512); @@ -168,7 +164,12 @@ av_cold void ff_mpeg12_init_vlcs(void) INIT_2D_VLC_RL(ff_rl_mpeg1, 680, 0); INIT_2D_VLC_RL(ff_rl_mpeg2, 674, 0); - } +} + +av_cold void ff_mpeg12_init_vlcs(void) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + ff_thread_once(&init_static_once, mpeg12_init_vlcs); } /**