From patchwork Mon Nov 30 00:54:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24170 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 394A844A277 for ; Mon, 30 Nov 2020 02:58:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB273689B32; Mon, 30 Nov 2020 02:55:57 +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 F15276897E4 for ; Mon, 30 Nov 2020 02:55:41 +0200 (EET) Received: by mail-ej1-f65.google.com with SMTP id qw4so7923918ejb.12 for ; Sun, 29 Nov 2020 16:55:41 -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=56t0/6QmhQE4ScUpvB2x3FyOtbsa0hvja0t6tn4DKLI=; b=rp7fLaktnfBUucUceRyAx4zSU95arHZdHce/s2gcoZoGFlZYqvdlX0V+SbQ3fASSnP XPV1e1IV2u2VHIe1fERfrbiI2+AGJJbXxbr3dLpqDlxnExErH5gbG2jF+KaDQWLRuDcT AYSPcgMdsV5MpN4KnMqrAVDdqGI6diN0oCgABD66WC1SbwHsvRmQY2ZXCDmgZ8k2Gzcf vCbQotCQK04QgShqITEXSTMH/RR1YawlSf45+L9bXKi+BVp4KEK6tViAESyt0K9es4QL a8+KaVGLIbstraaEN86R40qSVjcpK3J2NVmaE/P4eXSschX/V5gGWSMVF/z058f41zZd kr0w== 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=56t0/6QmhQE4ScUpvB2x3FyOtbsa0hvja0t6tn4DKLI=; b=ByxKwrL6Gq7hJEFHzUlF/VgRlLjWRetuAO3kAYAYLdLI5UPW3c/riN7lDKEEcXVray oZSTa9rbsyy789Mi7IDkIjoqhCnpXsGUG7QWxGs9q6PtfG/Qpqlj6VbHaDxXHsPZeYcz Rn9dPEgMmKCzc3qSSropFNPjtiT4OEDnTsNjkNamWEsmu6Z6oKniMJIgiZOU5XrcQASA l5eAW/2oUayJtA0D56r8Cq8Ou1rCLJE5JND4gC1gr2hGwi+kWmXHKxeCqCZge6sOnvIo boSnA/hVSZjSi7t0Ef3lLdTbNIqmyWytaNTvaYeWE1y30+x/oR9fyN4XFYEFCmhVYI36 TxVA== X-Gm-Message-State: AOAM532Frz5fMmy231X6St9vU0dDEb7FT27aewsEGPNTFgh+wptDxzjM lQGymXb8XExWOdlMMBtHBkmGvRb+E8Aodg== X-Google-Smtp-Source: ABdhPJxPXQksscD0lvsNc18wZaoAFdD7/+HIi6n4OJh1jwMh0hikVFNEpDlag2Ipfl09d0eY94xhag== X-Received: by 2002:a17:906:eb17:: with SMTP id mb23mr8086283ejb.501.1606697741283; Sun, 29 Nov 2020 16:55:41 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id b20sm3354993eja.30.2020.11.29.16.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Nov 2020 16:55:40 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Nov 2020 01:54:11 +0100 Message-Id: <20201130005454.110441-19-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 091/134] avcodec/indeo3: 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/indeo3.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 75113a7541..cf2cb9134f 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -31,6 +31,7 @@ #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "copy_block.h" #include "bytestream.h" @@ -1049,12 +1050,13 @@ static void output_plane(const Plane *plane, int buf_sel, uint8_t *dst, static av_cold int decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; Indeo3DecodeContext *ctx = avctx->priv_data; ctx->avctx = avctx; avctx->pix_fmt = AV_PIX_FMT_YUV410P; - build_requant_tab(); + ff_thread_once(&init_static_once, build_requant_tab); ff_hpeldsp_init(&ctx->hdsp, avctx->flags); @@ -1141,5 +1143,5 @@ AVCodec ff_indeo3_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };