From patchwork Mon Nov 23 19:37:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24015 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 AE6F8449A80 for ; Mon, 23 Nov 2020 22:44:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9872D68BBD8; Mon, 23 Nov 2020 22:44:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AA7168BB27 for ; Mon, 23 Nov 2020 22:43:53 +0200 (EET) Received: by mail-lf1-f67.google.com with SMTP id d17so25660597lfq.10 for ; Mon, 23 Nov 2020 12:43:53 -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=cAhC7PgY+ANHiGi9mzbckt/TUJ42rI7mCLpDAOAAtLk=; b=MQ1WmWeKGp4K9GEIkURYeeHW0vjRopnVyLjThWUKUGxXuBqOlqK3SKfEZ2/ko7TCj6 j2hXesVq07BYDAVPfPmyyTK1moLSlk1iNgV2vCBnBwrGFaeHPcSEiwRTon5Tom3QAaHA KjgkJiwmVJzwke53/oyLbUZt9jDmJqeCPCG+v4M541cTZcuqtNGs2tGHKgR754fALonu PbLiBfALQRCFZ8ZyEwLQaNhV/hwqUIKx2GaYRfpbzXsMzzAhCUVAirqHQpGhwWpJgk3c an+6Kvy/vyNGJ6yNp267HcDMLKedSLhfhXEgeJU/a/YnB99pF/EzT71W+X8pQ68UBmOG ImnQ== 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=cAhC7PgY+ANHiGi9mzbckt/TUJ42rI7mCLpDAOAAtLk=; b=T9OthDq+PgbpuMYtR9GvLNFNc1A3tUaKcYECuRU+LuGSbakK2XcKVSOnTrPLBYeUxS T1HUMEIlqwd8OQnAYcAWYk+JoFuJO7TkP/TZZTYHiTKN/yfmZ/r3DX+OMjeqw+eGMNzv awgBQ3ERPCSmHXdu5fXxK22+gl/YnRyz8duUHgqMmQt5kETsNyh2gkTGn3/QE5ROUCG4 O1I4+oYWr/0wPYVa5OSIoQDiknQKh7vujAMz3f/UCn6FdWSNtkx+xxJ/V+yihKnt/pl6 JzQ4JgPa1QJ4sqlVTI/+H9UuEw4QMzKJwYXnLZLn+ryJgv/2ui/1gT4GFf0fi5i35Hd6 WuVg== X-Gm-Message-State: AOAM530m2YoKwfa5Lvi0SJWuZhajHTZJFpU79JFU1WWtxqMrycmGfuLp LQ1cfwtiHdyTeufk4/UjgXtyXJikqzS3XQ== X-Google-Smtp-Source: ABdhPJyY/yNn8wnx1ajsi6y94/5flwEg28oUaNkn4VifLVL5UJtCQ7SqTFyHW9zt2g7DTvYJ/XmKnQ== X-Received: by 2002:a5d:4b81:: with SMTP id b1mr1338406wrt.372.1606160274242; Mon, 23 Nov 2020 11:37:54 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e6sm564086wme.27.2020.11.23.11.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:37:53 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:12 +0100 Message-Id: <20201123193739.1249300-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 164/191] avcodec/atrac3: Make decoders 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/atrac3.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 48f0f20a0a..e80c39d492 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -39,6 +39,8 @@ #include "libavutil/attributes.h" #include "libavutil/float_dsp.h" #include "libavutil/libm.h" +#include "libavutil/thread.h" + #include "avcodec.h" #include "bytestream.h" #include "fft.h" @@ -870,7 +872,7 @@ static av_cold void atrac3_init_static_data(void) static av_cold int atrac3_decode_init(AVCodecContext *avctx) { - static int static_init_done; + static AVOnce init_static_once = AV_ONCE_INIT; int i, js_pair, ret; int version, delay, samples_per_frame, frame_factor; const uint8_t *edata_ptr = avctx->extradata; @@ -882,10 +884,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (!static_init_done) - atrac3_init_static_data(); - static_init_done = 1; - /* Take care of the codec-specific extradata. */ if (avctx->codec_id == AV_CODEC_ID_ATRAC3AL) { version = 4; @@ -1009,6 +1007,8 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) if (!q->units) return AVERROR(ENOMEM); + ff_thread_once(&init_static_once, atrac3_init_static_data); + return 0; } @@ -1024,7 +1024,7 @@ AVCodec ff_atrac3_decoder = { .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, }; AVCodec ff_atrac3al_decoder = { @@ -1039,5 +1039,5 @@ AVCodec ff_atrac3al_decoder = { .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, };