From patchwork Thu Dec 10 11:16:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24498 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 7B66044A03C for ; Thu, 10 Dec 2020 13:23:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB43868A882; Thu, 10 Dec 2020 13:19:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C5A4688158 for ; Thu, 10 Dec 2020 13:19:17 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id e25so4905656wme.0 for ; Thu, 10 Dec 2020 03:19:17 -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=l9/wmoqdugOAzPFfS2Oa8xY/DKCmhfxDgSoP1hNLBtM=; b=anJd+PshWP0/czpqd3l0pTc6kYl9gOa+9PurAXwvZ3ZFpeJoEAE+t9jVQtUrSFmIjc cYXNHCGYUsf/zusBB19NkVpUyBSOsGmr5IVo62o/Ee4RgHFGIILm4FDdtFVLAfARQEj5 TgAurRz66oHZfgTWpQkjSxpbsy0wV/1mxfCAss/Yyo3jzmC0qrIZkR/pHiQoWpBEDTyV w9DvjMM4l2L1xL7mmWXJT23Tmr8TmPk6jfOtPA7dbxa2hY+cTACArhj4N33oRVgUaWsr yr6/nr6zOW0ea9aXMCXm5BO9rW5FxXX1GSKbNyu9SKuicI+I+jsdPXKd/W4TSJe0F7Do uJsA== 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=l9/wmoqdugOAzPFfS2Oa8xY/DKCmhfxDgSoP1hNLBtM=; b=E0t/no9ROhL+GbHdq3hJDgOJIhYJKipAmWonEDhdIy7qmpdDrSzfKY0y8DNqnyxoQi Sp3Arl1AV/QiSvBEUWswMuTpK3EtfsjbZb6CZuGZLEETU8Abq2pvPO8CsUlHEI0bCo8/ 1u8q1Y6Ex3RAtf24H+uBwfStukUfArB/xv07aIeDSGOWJLzoJiarLzWRG7iO/gdZs+Ki bZX793A4IuzqwrWpwatpxju3W19Zn+5gQBfcWbpSx3YJhsUCbI0tV2GH1DcLMXpodOwb 7pMsp+TQh26UwIlf5uN2ziOsRkCoBCp73DWTCMDWYavkv5l5CClmZ/2z2/mCvG+9TQBD 6TlA== X-Gm-Message-State: AOAM531HoHGq9sbtcrc95NKfdctp3S5i5l1RW9X8V5tPgDQNtxZFlXKS NtytoJqF4ExzOHgwcfKoyGc3UFy9FN2jlg== X-Google-Smtp-Source: ABdhPJzUtLU6mopzStUBDdi3CffZW2+6L1mJaN3/ZKQhqlMWXn3OkJyWC1rElSf7sx/i9U54FKIwGw== X-Received: by 2002:a7b:c389:: with SMTP id s9mr7431553wmj.159.1607599156485; Thu, 10 Dec 2020 03:19:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:19:16 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:48 +0100 Message-Id: <20201210111657.2276739-31-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 30/39] avcodec/msmpeg4: Make ff_msmpeg4_common_init() thread-safe 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/msmpeg4.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 920f50f32c..ea1083c1a0 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -27,6 +27,8 @@ * MSMPEG4 backend for encoder and decoder */ +#include "libavutil/thread.h" + #include "avcodec.h" #include "idctdsp.h" #include "mpegvideo.h" @@ -53,9 +55,6 @@ static av_cold void init_h263_dc_for_msmpeg4(void) { int level, uni_code, uni_len; - if(ff_v2_dc_chroma_table[255 + 256][1]) - return; - for(level=-256; level<256; level++){ int size, v, l; /* find number of bits */ @@ -108,6 +107,8 @@ static av_cold void init_h263_dc_for_msmpeg4(void) av_cold void ff_msmpeg4_common_init(MpegEncContext *s) { + static AVOnce init_static_once = AV_ONCE_INIT; + switch(s->msmpeg4_version){ case 1: case 2: @@ -146,7 +147,7 @@ av_cold void ff_msmpeg4_common_init(MpegEncContext *s) } //Note the default tables are set in common_init in mpegvideo.c - init_h263_dc_for_msmpeg4(); + ff_thread_once(&init_static_once, init_h263_dc_for_msmpeg4); } /* predict coded block */