From patchwork Thu Dec 10 11:16:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24474 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 1F73244AF7C for ; Thu, 10 Dec 2020 13:18:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01AB2689CFB; Thu, 10 Dec 2020 13:18:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9011689C60 for ; Thu, 10 Dec 2020 13:18:48 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id c198so4311851wmd.0 for ; Thu, 10 Dec 2020 03:18:48 -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=XcwPFrWDcG9TCHX2BQyQagBthrjsMS9BAnGTPqUY8D8=; b=JsPirXHgBlpTWxhuFQxrGvkXsiBHeO+XvbMr71aZ91KBtVhWacQ+x4f36KSZTUD4Bf NoMnpk1HjzbpX/BgibtI9w+cFVlmf6K+A1jWEy51Ytlo6gBhw6u7E4boNcimEMvIEHLR kMcZUTvmi56ZMHeeruHSpcn4P48jiCAPNACE5EklmBFkkw62f+Jl6ZKk6w3gAbIfZ0vf Sw3RhvL586wCoGyU920nY5O9uO7vDJHZScSNitiuq6N0sWnNbswfj83torkcNOIcldTn dw8fw+fsd5blqWG67JDM0gqJZPiSaePf6mcExlmQIBWC3/nzSh+5d6fVNdoQq4kZD3PZ nWzQ== 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=XcwPFrWDcG9TCHX2BQyQagBthrjsMS9BAnGTPqUY8D8=; b=S0hOwPNTulUDjwKMNDi1G8juJcRFoXeeulCPctpo5AmchOW9dU+5RpzFK5KGFncvJy nMuFeC5T/1tit+1VIQS0uGUkf+pAoaL+ODD0SZ5cZBq4XRUxoxVIs+TA445nWLBjeMoF kTSFh9zArsKmwlFGG15hrfutWq0PLAhWdr1X+glMxJQMW/FmQjGWPrIA2teeH5mYgTYG QSJsSPNJMHhjUp6Jk5cl65O8IkToaCT/+ttnLE7itfOL9tmk5t0/5j+nbb+fqkjv7nCK 5THZMSw4EfyfBzkRrTlu1N26buVwbZ/zjO6gPvDxZcmHUZD4X2zh9b6XYxqsRO4QzfDV nwnQ== X-Gm-Message-State: AOAM533EHeq/3I+geZuPVk92GjUKNTjywmo9gcZYNjAP8cLxh4wbHHxW q8ASGLPHBDswtcM1fVrkkIgeTO9bGWZeOw== X-Google-Smtp-Source: ABdhPJzfNfQFpknD6lb8n1LxwUzLeqXFrNblYXpMWrJPFGpin0QCXzpbyJ9vSKyJ1aZpxeEQmqx7mQ== X-Received: by 2002:a05:600c:210e:: with SMTP id u14mr7742434wml.48.1607599128143; Thu, 10 Dec 2020 03:18:48 -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.18.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:18:47 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:21 +0100 Message-Id: <20201210111657.2276739-4-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 03/39] avcodec/mpeg12: Make initializing VLCs 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" This automatically makes the eamad, eatqi, ipu and mdec decoders init-threadsafe; in addition to the actual mpeg[12]video decoders, of course. Signed-off-by: Andreas Rheinhardt --- libavcodec/eamad.c | 1 + libavcodec/eatqi.c | 1 + libavcodec/mdec.c | 1 + libavcodec/mpeg12.c | 15 ++++++++------- libavcodec/mpeg12dec.c | 11 +++++++---- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 7f28abbafe..9dccddd6d3 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -349,4 +349,5 @@ AVCodec ff_eamad_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 96536b1a08..456bd3c563 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -189,4 +189,5 @@ AVCodec ff_eatqi_decoder = { .close = tqi_decode_end, .decode = tqi_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index b16cbb6a79..d0bb1162b6 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -258,4 +258,5 @@ AVCodec ff_mdec_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index b4ef41e12d..2aaed89920 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -30,6 +30,7 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/timecode.h" +#include "libavutil/thread.h" #include "internal.h" #include "avcodec.h" @@ -132,13 +133,8 @@ VLC ff_mb_ptype_vlc; VLC ff_mb_btype_vlc; VLC ff_mb_pat_vlc; -av_cold void ff_mpeg12_init_vlcs(void) +static av_cold void mpeg12_init_vlcs(void) { - static int done = 0; - - if (!done) { - done = 1; - INIT_VLC_STATIC(&ff_dc_lum_vlc, DC_VLC_BITS, 12, ff_mpeg12_vlc_dc_lum_bits, 1, 1, ff_mpeg12_vlc_dc_lum_code, 2, 2, 512); @@ -164,7 +160,12 @@ av_cold void ff_mpeg12_init_vlcs(void) INIT_2D_VLC_RL(ff_rl_mpeg1, 680, 0); INIT_2D_VLC_RL(ff_rl_mpeg2, 674, 0); - } +} + +av_cold void ff_mpeg12_init_vlcs(void) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + ff_thread_once(&init_static_once, mpeg12_init_vlcs); } /** diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 6d0e9fc7ed..7d797c259a 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2899,7 +2899,8 @@ AVCodec ff_mpeg1video_decoder = { .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .flush = flush, .max_lowres = 3, .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context), @@ -2932,7 +2933,8 @@ AVCodec ff_mpeg2video_decoder = { .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .flush = flush, .max_lowres = 3, .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles), @@ -2976,7 +2978,8 @@ AVCodec ff_mpegvideo_decoder = { .close = mpeg_decode_end, .decode = mpeg_decode_frame, .capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .flush = flush, .max_lowres = 3, }; @@ -3139,5 +3142,5 @@ AVCodec ff_ipu_decoder = { .decode = ipu_decode_frame, .close = ipu_decode_end, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };