From patchwork Mon Nov 23 19:37:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24003 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 D4E2644B12D for ; Mon, 23 Nov 2020 21:41:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9B7968BC63; Mon, 23 Nov 2020 21:38:40 +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 99CAC68BBD9 for ; Mon, 23 Nov 2020 21:38:25 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id r3so1492068wrt.2 for ; Mon, 23 Nov 2020 11:38: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=23XsAFch8UHDa6HrLsZz+VpNYfoFO2pAWYJMRaMNtaM=; b=ZnXCa5Vr9XxF0hZmYCaDlWfdG54OyvQCNkyAa4D8mVDMiEywVmGviDau41V2lzvXRF lXCdU+dxA8ACOFIZ0tndgWfTcHz/uhyetTOfQUz4th5rNfJbYaszskgDaRhhYD1Bjtck l5SSTq5TYPkgQ9qferqH6pROY6ACMbNk50QpsQTCsMdG2mUrV0E6fOQ55LfjhZ/UZy16 UvFG2bhODeUQYjiOy+uIORUtxyDwq8bmOb6Wd03lXvIIHLwcYCwAuG3eOxRdnw0ltdCh u4YgVvWkdyV9OSKeTBtvTkDYQJ6+HnM4AP/Ce6S2pwW2SCeBMRTDHOZgV8c9nZqrHNfA 8U0w== 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=23XsAFch8UHDa6HrLsZz+VpNYfoFO2pAWYJMRaMNtaM=; b=QAk4jyIutZghYKtzgcBST0P+C1z+C5AJZCQ0PRZ5HyLFOKzsn7BMYQhcAizDqu50lW POQOLz4rAhi1UtV7RRxXOAhsN1OqhjyXkuwArIyDuKfpzPKqSQ4N8JvGNRAA8zHNQlxk iCL4FP5kfourpi2A4L2M3C8VnWS0YqU1Uh/eTxD/dvEr3nUjNmUeXpIDcx9buGH9AjiW vqhprbX+SKaf9DnhgnplhOm9cwS/rrfeEW8DzaD/xIMpU+h7mQJ99AsAUWKZEpdBf2ve JydPIDElWeotZRvKBgOyXJDkAFjyhfbHc0R2DfHCk+mj+F85izP6N477PE7WAoYeXiSr aLoQ== X-Gm-Message-State: AOAM5331znjcTKuttj9wrlSA4Sz/UNQ3uvDo2MpvZLmJdzbh9XZeefqV uk3K7J/92B3+aSBy4K9flWVThWgswoOCqQ== X-Google-Smtp-Source: ABdhPJxqtJ+qbqx9GMofSNwFklisg1joL3gNi3QSpif34UZkwIuYrozQiPMyOJ2M3oqlrSxB+yZxwA== X-Received: by 2002:a5d:474f:: with SMTP id o15mr1325584wrs.100.1606160304827; Mon, 23 Nov 2020 11:38:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:38:24 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:30 +0100 Message-Id: <20201123193739.1249300-20-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 182/191] avcodec/h261dec: 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/h261dec.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 8a49e7d894..377842c6fb 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -26,6 +26,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "mpeg_er.h" #include "mpegutils.h" @@ -47,12 +48,8 @@ static VLC h261_mtype_vlc; static VLC h261_mv_vlc; static VLC h261_cbp_vlc; -static av_cold void h261_decode_init_vlc(H261Context *h) +static av_cold void h261_decode_init_static(void) { - static int done = 0; - - if (!done) { - done = 1; INIT_VLC_STATIC(&h261_mba_vlc, H261_MBA_VLC_BITS, 35, ff_h261_mba_bits, 1, 1, ff_h261_mba_code, 1, 1, 662); @@ -66,11 +63,13 @@ static av_cold void h261_decode_init_vlc(H261Context *h) &ff_h261_cbp_tab[0][1], 2, 1, &ff_h261_cbp_tab[0][0], 2, 1, 512); INIT_VLC_RL(ff_h261_rl_tcoeff, 552); - } + + ff_h261_common_init(); } static av_cold int h261_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; H261Context *h = avctx->priv_data; MpegEncContext *const s = &h->s; @@ -82,11 +81,10 @@ static av_cold int h261_decode_init(AVCodecContext *avctx) s->low_delay = 1; avctx->pix_fmt = AV_PIX_FMT_YUV420P; - ff_h261_common_init(); - h261_decode_init_vlc(h); - h->gob_start_code_skipped = 0; + ff_thread_once(&init_static_once, h261_decode_init_static); + return 0; } @@ -686,6 +684,6 @@ AVCodec ff_h261_decoder = { .close = h261_decode_end, .decode = h261_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, .max_lowres = 3, };