From patchwork Fri Nov 27 17:46: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: 24101 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 A935344A211 for ; Fri, 27 Nov 2020 19:47:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8C63968B9C4; Fri, 27 Nov 2020 19:47:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A76568B995 for ; Fri, 27 Nov 2020 19:47:25 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id k14so6435079wrn.1 for ; Fri, 27 Nov 2020 09:47:25 -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=ifzI9im6hIxbc059jTwozAEUaFABMhqEIdhFaG/Itrs=; b=b8wf2b6P7kySp0HkOZCPXD5H2fTH4tIK9L4uz67A8fkFuJydhJ2ZV3mqJ5yQWuX3pn ynd5cHFJwwAllyCgHA0dq53G+JF5I0fjs7ufaQZ+mgFepfeT60DK5YzoBzryDZNci01v kpgcHuypQXMplDcMOUh4fJcsJoKZTKpfz14Uc4Iox/hNL3pglaTYnpQVmtViz9Ohp/EX MTCKEipPxNu0NXbUAKuijWh4KxnSKhN59GECA9ip0BcxCBBtN23tiXNMGAi6XxOn2+BS RhxjYl/5vl99TWFYYnmc/u+IsiSNmA1BjkM31l8je2uwaE4K95mX7gpMAQZVIUYQHLFr 1F5g== 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=ifzI9im6hIxbc059jTwozAEUaFABMhqEIdhFaG/Itrs=; b=hdST++Zhc3ZSV3/HVIKXYNEvnMvibdB5bHmaGAbxqzT3N3KqAZakHOO/aysP1XxLQT VGb9ZRADcbgEQU1ZJHVtUt1ZQky5W3bN1O13o729lVjUjTE1Op2Jzh7HnO2/xOYgC2Sl RV/7LXb9w4qZ7Wn15gkILxr9xxjgN3aKvbEYgzGmOvUY7idOmKmpvVVOErCVKqZmOdaq 0opLDIC4v2+/6EFPHM9YtcMUZbOz2SItYP+scV4NyQGP4jiWcV76SD7bhf6M+UuPxlwk 2ho1XkWwOSNDLWHHwRXq+jxkbKfvuGoWwaFKDID0E6iLwL/Wi1KOfpOB+eFYhv9/HW3T VrKw== X-Gm-Message-State: AOAM533es9uBcHj5l/vf/ksLTfe5CNwHTI+7c7QbMYNQJw4BHsuPeyDr 0d+HoUp6lnnGRGdXtkenJ6SfvMsSq16kiA== X-Google-Smtp-Source: ABdhPJy1lMh0rw8D930Ch/plClyLHsi7xnw8ZTrHok1FafOUZ9MDK3mlcvnfVFvYJiUuWLa6haaUIQ== X-Received: by 2002:adf:f783:: with SMTP id q3mr11940368wrp.88.1606499244640; Fri, 27 Nov 2020 09:47:24 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id r13sm9941700wrm.25.2020.11.27.09.47.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 09:47:24 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Nov 2020 18:46:27 +0100 Message-Id: <20201127174652.2838198-2-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 47/72] avcodec/svq1dec: 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/svq1dec.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index e67b460ae3..7aea138060 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -33,6 +33,7 @@ */ #include "libavutil/crc.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "get_bits.h" @@ -762,22 +763,8 @@ err: return result; } -static av_cold int svq1_decode_init(AVCodecContext *avctx) +static av_cold void svq1_static_init(void) { - SVQ1Context *s = avctx->priv_data; - int i; - int offset = 0; - - s->prev = av_frame_alloc(); - if (!s->prev) - return AVERROR(ENOMEM); - - s->width = avctx->width + 3 & ~3; - s->height = avctx->height + 3 & ~3; - avctx->pix_fmt = AV_PIX_FMT_YUV410P; - - ff_hpeldsp_init(&s->hdsp, avctx->flags); - INIT_VLC_STATIC(&svq1_block_type, 2, 4, &ff_svq1_block_type_vlc[0][1], 2, 1, &ff_svq1_block_type_vlc[0][0], 2, 1, 6); @@ -786,7 +773,7 @@ static av_cold int svq1_decode_init(AVCodecContext *avctx) &ff_mvtab[0][1], 2, 1, &ff_mvtab[0][0], 2, 1, 176); - for (i = 0; i < 6; i++) { + for (int i = 0, offset = 0; i < 6; i++) { static const uint8_t sizes[2][6] = { { 14, 10, 14, 18, 16, 18 }, { 10, 10, 14, 14, 14, 16 } }; static VLC_TYPE table[168][2]; @@ -813,6 +800,24 @@ static av_cold int svq1_decode_init(AVCodecContext *avctx) INIT_VLC_STATIC(&svq1_inter_mean, 9, 512, &ff_svq1_inter_mean_vlc[0][1], 4, 2, &ff_svq1_inter_mean_vlc[0][0], 4, 2, 1434); +} + +static av_cold int svq1_decode_init(AVCodecContext *avctx) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + SVQ1Context *s = avctx->priv_data; + + s->prev = av_frame_alloc(); + if (!s->prev) + return AVERROR(ENOMEM); + + s->width = avctx->width + 3 & ~3; + s->height = avctx->height + 3 & ~3; + avctx->pix_fmt = AV_PIX_FMT_YUV410P; + + ff_hpeldsp_init(&s->hdsp, avctx->flags); + + ff_thread_once(&init_static_once, svq1_static_init); return 0; } @@ -848,4 +853,5 @@ AVCodec ff_svq1_decoder = { .flush = svq1_flush, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };