From patchwork Thu Dec 10 11:16:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24484 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 CAB6D44AF7C for ; Thu, 10 Dec 2020 13:19:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B6DE968A6EB; Thu, 10 Dec 2020 13:19:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BD2D68A5F4 for ; Thu, 10 Dec 2020 13:19:07 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id 3so4897675wmg.4 for ; Thu, 10 Dec 2020 03:19:07 -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=SvjSkqnRvsGCZmtVoIla8bDrynhjXC6SG8pUcUOR5Lc=; b=rhTwzxSn+qfLb6mWgznNhqyygs5kVKkWJm7ukj/ymcfV1lbyHWWxSfBE9dP5e8h5s5 pk9fyCt/bkZPalP+lvs/rzIPBoqUV58i4xeoJ4J1zo2KD84nfScpmAE5J8S7b/LXUZxQ x5nC0VuEass2kaVLfwuiNjguzm3Bw8KOgfJ9jxkobC/BgElvG0fpwnpJBIB62yk2kFj3 qj6mU1nXzOIWlkjjNSG30c8T9gO8PgcauAQvnkx/6HfitcUgfWaxOiFyfYqmXwKKhL6e upjnJ4k0wlnK14oAujq76zZi2Hy/lheu2YL94gYQ7b0/NAS/v3aqxgZUvoXkCjoL7wpj vcxg== 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=SvjSkqnRvsGCZmtVoIla8bDrynhjXC6SG8pUcUOR5Lc=; b=p5rHiH42opYg1SuIUKqNlpwU16HBjv6+mBXEwRPDI9rQi2E+JIqifYD3+0/Yto/zWs IVlld2HLokC+8w874AIXc5Li7CdDRgL6um7G18ykpbrgXrmJ4omQxYOXHrqLxzA/NKc1 ucIPpbFH8A5e606BayTnMyPeJQCVyB0ed3oiADi5M6yXLC1T+EAJcX2PeCFPr4bz73+l Q4EtBZIVOobMVgC30m7/apl63Eh2IbXupGq8S/Nh0LWmNq6CQyzhi9vbdlsU4qDDQMZ/ ryhTyowwLlK7Wx3hmi5Aho046dVJnx5v5sFQQeIBppV1bZEmlSuofr4d0uas3LsBFz5o QgsQ== X-Gm-Message-State: AOAM531zfkpvoHwyn44N+aG0RvBcYTQw/F4InyeviRHp8HqxRMoUCc1o ZhYWuBsRSTqbCk5HGHAJVTxal1uofSejXQ== X-Google-Smtp-Source: ABdhPJyaEyeIxypa3N66C/Q1PEYs7+LEj0GthATKFqN6m8zKgFS7M6Zgw0tgDjzGKCFAIPd7jP9nKg== X-Received: by 2002:a1c:2cc2:: with SMTP id s185mr7452069wms.111.1607599146903; Thu, 10 Dec 2020 03:19:06 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s133sm8942330wmf.38.2020.12.10.03.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:19:06 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:39 +0100 Message-Id: <20201210111657.2276739-22-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> References: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/39] 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 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 6b680a862d..61cd38caed 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,11 @@ 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_FIRST_VLC_RL(ff_h261_rl_tcoeff, 552); - } } 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; @@ -81,10 +78,10 @@ static av_cold int h261_decode_init(AVCodecContext *avctx) s->low_delay = 1; avctx->pix_fmt = AV_PIX_FMT_YUV420P; - h261_decode_init_vlc(h); - h->gob_start_code_skipped = 0; + ff_thread_once(&init_static_once, h261_decode_init_static); + return 0; } @@ -684,6 +681,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_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .max_lowres = 3, };