From patchwork Fri Nov 20 07:19:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23818 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 4CEB744AFE3 for ; Fri, 20 Nov 2020 09:35:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A93268BB8E; Fri, 20 Nov 2020 09:25:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48BE368B9E3 for ; Fri, 20 Nov 2020 09:25:14 +0200 (EET) Received: by mail-ej1-f66.google.com with SMTP id f20so11492453ejz.4 for ; Thu, 19 Nov 2020 23:25:14 -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=btMYmG8LDu2S58WLkkI7rJN21PLrWDAVykVrq0jsh8A=; b=nrkig9yR7Wxj2avV5aS7hpU99SwaAc/uW3QYdqakcQGoCa7L74zez+Gd82Rnf/Xn7m Iyy0mi6Ekum24qzx6QJDVLWKsEuQjcn/tZok+4uLAANNBCQLvMmgDw+VmGbFxPr9JHwW b49ckQfxJiQXAByxrbu4NWpSuYeqz+XeNRLeM45LwAv/729KG1qtxwEO82ZmRfiqtoob MhYO2Qd0f9gO5qF0kTaUam6+f4nleT86z5i76KxMzih/h7XUYz5+L/7REvaGwrA7nm39 OFgCZE0HWUyZ5CRQNjpfbajgCAVJ/7SWHIydkDIEtFFn2mThe707XA/sYgbQZX6E2JfD VrPQ== 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=btMYmG8LDu2S58WLkkI7rJN21PLrWDAVykVrq0jsh8A=; b=qjxvc0yJMCG2h7ndk1QIHxfAx6knqJKMHeeELJAtj2irNE85+O8ls60QQ9CqP5phQG RPHtlADF+nG/dlXxAY9yIV1vBpIhiP/e0ymOLWwIQGP1tskwUlFz0cY2BKPjeY0IbDYR F7wIDkMMByYGAKxAbTK2ggcMslaozZMWUIEOmRjutr7eenxodi/x5p8QBnRFFEYfljvc gQnRbT0/WkQ4cfPT8OWlEGWmK3FhCotDdY6lNBGTAgqgDgAdwpgo+S6KbEvFJV7QFhhG el0QGbFp6WDCzONjNNQro+oks4EAnnRARXep0P3S/GzbCM8yPZfkaygK/E0JoWT+A6MA ElVQ== X-Gm-Message-State: AOAM530qopM4ejmbUnKNFdGl+q23dYz1RWsrHfgJ0TtWFJh9BslyAeBa lVXd1+XV+aUULBInPInRb+76ACltnrBGuQ== X-Google-Smtp-Source: ABdhPJx64wk97AR10NqoSl6JabKc0sN625yeayX63ZmlboRwomdVXgv3TN4X0OgvEr4gq7seMnzHzA== X-Received: by 2002:a17:907:9d0:: with SMTP id bx16mr32735465ejc.426.1605857113366; Thu, 19 Nov 2020 23:25:13 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id lz27sm779419ejb.39.2020.11.19.23.25.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:25:12 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:19:36 +0100 Message-Id: <20201120072116.818090-64-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 v2 063/162] avcodec/mobiclip: 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/mobiclip.c | 47 +++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index d188e1cd57..ce9bcf6afb 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -23,6 +23,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "bytestream.h" @@ -274,8 +275,32 @@ typedef struct MobiClipContext { static VLC rl_vlc[2]; static VLC mv_vlc[2][16]; +static av_cold void mobiclip_init_static(void) +{ + INIT_VLC_STATIC_FROM_LENGTHS(&rl_vlc[0], MOBI_RL_VLC_BITS, 104, + bits0, sizeof(*bits0), + syms0, sizeof(*syms0), sizeof(*syms0), + 0, 0, 1 << MOBI_RL_VLC_BITS); + INIT_VLC_STATIC_FROM_LENGTHS(&rl_vlc[1], MOBI_RL_VLC_BITS, 104, + bits0, sizeof(*bits0), + syms1, sizeof(*syms1), sizeof(*syms1), + 0, 0, 1 << MOBI_RL_VLC_BITS); + for (int i = 0; i < 2; i++) { + static VLC_TYPE vlc_buf[2 * 16 << MOBI_MV_VLC_BITS][2]; + for (int j = 0; j < 16; j++) { + mv_vlc[i][j].table = &vlc_buf[(16 * i + j) << MOBI_MV_VLC_BITS]; + mv_vlc[i][j].table_allocated = 1 << MOBI_MV_VLC_BITS; + ff_init_vlc_from_lengths(&mv_vlc[i][j], MOBI_MV_VLC_BITS, mv_len[j], + mv_bits[i][j], sizeof(*mv_bits[i][j]), + mv_syms[i][j], sizeof(*mv_syms[i][j]), sizeof(*mv_syms[i][j]), + 0, INIT_VLC_USE_NEW_STATIC, NULL); + } + } +} + static av_cold int mobiclip_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; MobiClipContext *s = avctx->priv_data; if (avctx->width & 15 || avctx->height & 15) { @@ -298,25 +323,7 @@ static av_cold int mobiclip_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - INIT_VLC_STATIC_FROM_LENGTHS(&rl_vlc[0], MOBI_RL_VLC_BITS, 104, - bits0, sizeof(*bits0), - syms0, sizeof(*syms0), sizeof(*syms0), - 0, 0, 1 << MOBI_RL_VLC_BITS); - INIT_VLC_STATIC_FROM_LENGTHS(&rl_vlc[1], MOBI_RL_VLC_BITS, 104, - bits0, sizeof(*bits0), - syms1, sizeof(*syms1), sizeof(*syms1), - 0, 0, 1 << MOBI_RL_VLC_BITS); - for (int i = 0; i < 2; i++) { - static VLC_TYPE vlc_buf[2 * 16 << MOBI_MV_VLC_BITS][2]; - for (int j = 0; j < 16; j++) { - mv_vlc[i][j].table = &vlc_buf[(16 * i + j) << MOBI_MV_VLC_BITS]; - mv_vlc[i][j].table_allocated = 1 << MOBI_MV_VLC_BITS; - ff_init_vlc_from_lengths(&mv_vlc[i][j], MOBI_MV_VLC_BITS, mv_len[j], - mv_bits[i][j], sizeof(*mv_bits[i][j]), - mv_syms[i][j], sizeof(*mv_syms[i][j]), sizeof(*mv_syms[i][j]), - 0, INIT_VLC_USE_NEW_STATIC, NULL); - } - } + ff_thread_once(&init_static_once, mobiclip_init_static); return 0; } @@ -1341,5 +1348,5 @@ AVCodec ff_mobiclip_decoder = { .flush = mobiclip_flush, .close = mobiclip_close, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, };