From patchwork Mon Nov 23 19:37:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24011 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 AA79E44B44C for ; Mon, 23 Nov 2020 21:42:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C08D168BC92; Mon, 23 Nov 2020 21:38:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0CFD68BC31 for ; Mon, 23 Nov 2020 21:38:32 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id s13so381612wmh.4 for ; Mon, 23 Nov 2020 11:38:32 -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=w4Kss8n6T3thRmRWgIUYo3sJfdYVv7ArQO6HBawnjPc=; b=bCVt+9SqHjS5thpWkylPxCKJpGOkXIoHAjC2FieX8TTYQ37fXYZ7LAAE2cm/5MBSBw y/C8LnkOr5Q+Y/vrBdJRF5Mf0I5Gg9GInLWG2kV+o24q+zV7I2eboKFk2dvzyNvjtNEX m18n8krumcG1t8iA7axTGg8gHVqXR0D9IM9tJDv9mrfnKmSxPx9riXOsPqM7JGkTLxcQ LUGbNbkX4H4wWWlCVNYgfxXZooYtmSup3uSfhJpbJTDqmXZN/zdsdnVn9o6AznRZDWQE BQecCcPJbHtuZtyfUL6Oqt0iy4fHxumQITzZNNBsUC/qJ1cHjnz2PIMKRBP2E/7T8ILf NaDw== 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=w4Kss8n6T3thRmRWgIUYo3sJfdYVv7ArQO6HBawnjPc=; b=N4V0Jc/IkAdWo5VYF5OEOzNBJ0on+syzLMJZhZhXauuyMpRTAk6NQOLFw6q77c7Ecv olijEgb31Qe4x8ybGsyESRgOTJmqNmnlx8VIwEU8UDbRsO91pv3NVteOAuoyUMc5vl/h ujJs2MgW2x7M+17vKBoCgV+c+OKlx2LXKPJOkmeMOdg9Bmh/uW2JIBc6sW4fPIc3S+LV +p+OycnXpFW+mJ4IMTm9/F9UbKYngZGQjylwLtyb7rwKFLt3j5o3wOxzUl6V1eN0Kmy0 SvSurdAS+VBh4I5tuo6/Xcx9Ae0XUm/x9JgxyS3TeWYuaJbH4NJyqDOx8pOHCB+TfoqY 01lQ== X-Gm-Message-State: AOAM531orbmmgLeODLS4NIFekX6LT3n8TRkcSV5xm0YBPF9lYZbPT2Pc 6RRi5IB6TnUM5AxeHzgmy/7MvsKAk5hLMA== X-Google-Smtp-Source: ABdhPJy5MCG9dmjoNThfLvsw6fL76eIRzPG8KzmcBcPjTAMiFIN7ohPjnRArzM3cYDCH8df+91Xx+g== X-Received: by 2002:a1c:2e48:: with SMTP id u69mr512754wmu.30.1606160311895; Mon, 23 Nov 2020 11:38:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:38:31 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:37 +0100 Message-Id: <20201123193739.1249300-27-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 189/191] avcodec/ivi: 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 indeo4/5 init-threadsafe. Signed-off-by: Andreas Rheinhardt --- libavcodec/indeo4.c | 1 + libavcodec/indeo5.c | 2 +- libavcodec/ivi.c | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 4bfc6cdd74..e2778af6ca 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -713,4 +713,5 @@ AVCodec ff_indeo4_decoder = { .close = ff_ivi_decode_close, .decode = ff_ivi_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index ac15d31fef..3ee7a0e1d6 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -693,5 +693,5 @@ AVCodec ff_indeo5_decoder = { .close = ff_ivi_decode_close, .decode = ff_ivi_decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index 5e1180a5f0..a5074e9980 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -30,6 +30,7 @@ #include "libavutil/attributes.h" #include "libavutil/imgutils.h" +#include "libavutil/thread.h" #define BITSTREAM_READER_LE #include "avcodec.h" @@ -157,14 +158,11 @@ static int ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag) (flag ? INIT_VLC_USE_NEW_STATIC : 0) | INIT_VLC_OUTPUT_LE); } -av_cold void ff_ivi_init_static_vlc(void) +static av_cold void ivi_init_static_vlc(void) { int i; static VLC_TYPE table_data[8192 * 16][2]; - static int initialized_vlcs = 0; - if (initialized_vlcs) - return; for (i = 0; i < 8; i++) { ivi_mb_vlc_tabs[i].table = table_data + i * 2 * 8192; ivi_mb_vlc_tabs[i].table_allocated = 8192; @@ -175,7 +173,12 @@ av_cold void ff_ivi_init_static_vlc(void) ivi_create_huff_from_desc(&ivi_blk_huff_desc[i], &ivi_blk_vlc_tabs[i], 1); } - initialized_vlcs = 1; +} + +av_cold void ff_ivi_init_static_vlc(void) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + ff_thread_once(&init_static_once, ivi_init_static_vlc); } /*