From patchwork Wed Dec 2 04:21:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24278 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 B849B44A709 for ; Wed, 2 Dec 2020 06:29:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 939B368A0EF; Wed, 2 Dec 2020 06:24:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1138C68A0E1 for ; Wed, 2 Dec 2020 06:23:58 +0200 (EET) Received: by mail-ej1-f68.google.com with SMTP id a16so676007ejj.5 for ; Tue, 01 Dec 2020 20:23:58 -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=HSDnRpmYapj1SVT1uw9l05HKIObJ82tsDNZ9cUSPt28=; b=BliFJSzlGkS3BtzWgqiE/VGtlWUqxSy+eE3a/MXw9yLhZJUTVmi0QxE0Yzv82aZjTR wP/syLx0SIwfGr05f9nBoa+KqsX0lwwuW/fj9l7gnaV9dzOwhd/nMUONTA99KitzrmEF K+5/SQRQdALS03FlA4vd8W5P7mOqkQpZG5qR2ofZluKfaIdn3NsxTiSLmBpNuYktV6Rt YKk+57CqSONkhTZq05WflbD6T056L9BaqLgt1Mmpe1Gt+9K2pNowmP+Hem+PetQ7iDbI THgFHcMA+TUnIcR1AyUFiMP7qSd9qaXkytP0d8Nnr0+FAZteK6NFbFtd90l3blEMoXin Xymw== 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=HSDnRpmYapj1SVT1uw9l05HKIObJ82tsDNZ9cUSPt28=; b=DxCOoH4iy/S5GnpXmCiDTkUY6F9bLzpEOtWl1t9u7m//ickBjR1I8iRb9Sa2knZyo9 GeCMdZdF58kOz43AZ+0YqbVog7A+AN1bp+CEgL3oVKPZRXto5PaIzc7WIBLqMNYA37ei 0r6j8FoTvYnLykCEmwiKabVG7/z4Fm4oYTIm6s8cPQpheiAEBVEEcom3uE8f2FMzC5Sg Ywkmlp7bSi+cyZs3xAiiHid0uCuBBmTKN2/IEWwUgGryaMftUJpt+AE/aS2K4hg7pTb8 5b9rJ+O6MwQWeLVDRdUCt/v3FtW8EfgMXSPHno6/d1SjlKMxxsZ0mFssOFKG9s55qT/f 8hdA== X-Gm-Message-State: AOAM5326bB8Akh0S6kcfRDguVSzkGiiy9AkT/ljIXXt5srBnlGY0Z2Do RxDuLlqYMvVUFww9XpOqJjocAjEebbqK5g== X-Google-Smtp-Source: ABdhPJxgN+S3Ylt31v607e2MWNhOP8yYzLrwtqTpy3vpFgoH6sTmLZEzRZdwPvcNZFtSmP5cUvIT9g== X-Received: by 2002:a17:906:314f:: with SMTP id e15mr566252eje.496.1606883037361; Tue, 01 Dec 2020 20:23:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id mc25sm265087ejb.58.2020.12.01.20.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 20:23:56 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Dec 2020 05:21:59 +0100 Message-Id: <20201202042244.519127-38-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 172/217] avcodec/vima: 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/vima.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/libavcodec/vima.c b/libavcodec/vima.c index b4620acf6b..b0a2448ede 100644 --- a/libavcodec/vima.c +++ b/libavcodec/vima.c @@ -26,13 +26,13 @@ */ #include "libavutil/channel_layout.h" +#include "libavutil/thread.h" #include "adpcm_data.h" #include "avcodec.h" #include "get_bits.h" #include "internal.h" -static int predict_table_init = 0; static uint16_t predict_table[5786 * 2]; static const uint8_t size_table[] = { @@ -84,16 +84,9 @@ static const int8_t *const step_index_tables[] = { index_table4, index_table5, index_table6 }; -static av_cold int decode_init(AVCodecContext *avctx) +static av_cold void predict_table_init(void) { - int start_pos; - - avctx->sample_fmt = AV_SAMPLE_FMT_S16; - - if (predict_table_init) - return 0; - - for (start_pos = 0; start_pos < 64; start_pos++) { + for (int start_pos = 0; start_pos < 64; start_pos++) { unsigned int dest_pos, table_pos; for (table_pos = 0, dest_pos = start_pos; @@ -110,7 +103,15 @@ static av_cold int decode_init(AVCodecContext *avctx) predict_table[dest_pos] = put; } } - predict_table_init = 1; +} + +static av_cold int decode_init(AVCodecContext *avctx) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + + avctx->sample_fmt = AV_SAMPLE_FMT_S16; + + ff_thread_once(&init_static_once, predict_table_init); return 0; } @@ -215,4 +216,5 @@ AVCodec ff_adpcm_vima_decoder = { .init = decode_init, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };