From patchwork Tue Nov 24 14:41:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24025 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 E696144BE5C for ; Tue, 24 Nov 2020 16:42:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0F2C68BC8B; Tue, 24 Nov 2020 16:42:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80BD368BC7E for ; Tue, 24 Nov 2020 16:42:04 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id 1so3107249wme.3 for ; Tue, 24 Nov 2020 06:42:04 -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 :mime-version:content-transfer-encoding; bh=qaxVUsrc2wKSYW4KV6iWRQCNCb161SWgA9JFQyKaCnY=; b=CALaSBRwPbDGubd1BTuAFwJ25RfZpmitlsNgmEndGGv/om+z8Fcl1JrPQvM1cIqmrx 7fjQCk7E1ovSz3c0LsR3b85rcn9yNoFhol6W1dR/LsIXUIgCgbDwBhDmLc0b+aIupH+G qRfzldz3Jj83P7dsWDeE0iSarMgLQKs9qoBlPCWXITEpY7ciuuIShIJFwL1ENbZXXaUA kO48p5F6lhELRuFGcfNQQ0fMLJYpSNGc3eXzBIj4XHR+nxmR5zSruk6mHc0ia4qOtkKR +ozEud4NeSlPNjqDbglb8qdzikcJ+eSGFRN9hKnTiZxDZR06LzXW+ihb7rSJ7Q65zN9M Iokw== 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:mime-version:content-transfer-encoding; bh=qaxVUsrc2wKSYW4KV6iWRQCNCb161SWgA9JFQyKaCnY=; b=HOa18Su1pVyuaA7pRH1BKGJCunbXwWBynltQRySQKzKOa6TcZ89bpRDZlSSbUZCxzW WGQhSjfGqViptLqxH25VBX/nSwgz/Pf7cN7GJ+CALKTsJtzRynUYjKRRR1/haa/Vtgvn cYYdalTGcK8yC1wgsJINao84EXJH8PFhS7rPeZvsM86lBBYEYLZsBwrQt95NE4LT3Ivi oKZObd0sqRMUI5K2IXetLPTCdhF0NEqojQjxZkFtQtgnHE93OQgb8AsjNfCSS+zjSBvy 0CqJusilazKM17pieAZfI40vIu8e4WsymQTZzkbKiSrVQfUtW9UcZbd8id1/jvmcEfOF exxw== X-Gm-Message-State: AOAM532BZGO+IFb60AqiIJ5S4sTFvXixcNLIsww2WijVWviVGtn3i8M7 Q7SYndSZwV/n3U9wTgqinaM6zt9sukQsAg== X-Google-Smtp-Source: ABdhPJyO6fpqV2moJ/N+Ig+9jVN64nhEjKxSTLaEsH5aIqj90KKtWsuVgcojMKuTFyzKf2XSO1IjIg== X-Received: by 2002:a1c:4d13:: with SMTP id o19mr3407279wmh.58.1606228923789; Tue, 24 Nov 2020 06:42:03 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id 90sm26453232wrl.60.2020.11.24.06.42.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 06:42:03 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Nov 2020 15:41:20 +0100 Message-Id: <20201124144122.1994769-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201124144122.1994769-1-andreas.rheinhardt@gmail.com> References: <20201124144122.1994769-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/mpeg12enc: Use ff_thread_once() for static initializations 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/mpeg12enc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index eee4af0adc..b069f2db64 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -31,6 +31,7 @@ #include "libavutil/avassert.h" #include "libavutil/log.h" #include "libavutil/opt.h" +#include "libavutil/thread.h" #include "libavutil/timecode.h" #include "libavutil/stereo3d.h" @@ -1034,18 +1035,12 @@ void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64], mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 8); } -av_cold void ff_mpeg1_encode_init(MpegEncContext *s) +static av_cold void mpeg12_encode_init_static(void) { - static int done = 0; - - ff_mpeg12_common_init(s); - - if (!done) { int f_code; int mv; int i; - done = 1; ff_rl_init(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]); ff_rl_init(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]); @@ -1110,7 +1105,14 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) for (f_code = MAX_FCODE; f_code > 0; f_code--) for (mv = -(8 << f_code); mv < (8 << f_code); mv++) fcode_tab[mv + MAX_MV] = f_code; - } +} + +av_cold void ff_mpeg1_encode_init(MpegEncContext *s) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + + ff_mpeg12_common_init(s); + s->me.mv_penalty = mv_penalty; s->fcode_tab = fcode_tab; if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO) { @@ -1129,6 +1131,8 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) } s->inter_ac_vlc_length = s->inter_ac_vlc_last_length = uni_mpeg1_ac_vlc_len; + + ff_thread_once(&init_static_once, mpeg12_encode_init_static); } #define OFFSET(x) offsetof(MpegEncContext, x)