From patchwork Mon Nov 23 19:37:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23991 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 7445944A49B for ; Mon, 23 Nov 2020 21:38:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2200168BBF8; Mon, 23 Nov 2020 21:38:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9894F68BBBE for ; Mon, 23 Nov 2020 21:38:13 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id c198so331571wmd.0 for ; Mon, 23 Nov 2020 11:38:13 -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=Pc9qFEOjW0hbmSr90mQobBMLheeVLyrXf0yAJ9wiiLo=; b=hnMW2zfpf/NwuKn5PzQGZSaIt6TadwGxig/4MoitqD2GLnDARMJTbjD0PjssXLYz00 Ogp4/NekiHIn366GVzwxFDXZz1+qoKowOM2wJmzGon8leyfVqvruyaSJGnZXBjaxqnMo eFcaNW9ros/Z1rjFopdJOuVWhkOjpBaMtQ5o+fQ0rRp78i64MV7oXFyIrY7tjwEKEtvS hab2x7gsmdaj22P4FBGkQTReTYjeCtvsdL3a4cMKCUYr/op+5uXBEYXDBT4PRgUc+fqC 1RxMCzJWex7JwEmBCcFmsKQewOfw4ibTRCZaAC9qaCKDHOkQAGBfvFzKvTLVms2rs0uM 4TJQ== 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=Pc9qFEOjW0hbmSr90mQobBMLheeVLyrXf0yAJ9wiiLo=; b=gswhRJWy1DZjm2qHfawCjy7TvtTcPI7D0eQCDWc1XmNK7HTcOX1dYZR5/MUj9iV4Z1 AOt9yDMHMBjg/fovx2N+vqnpfiCX2c9xOkegS5Xkj5qDow4N/LJ5mBky4BmaW3y6GRh8 ChjyhrwjeL4XIRLErqMrT6DCHlMVdTtm2ltP/lzyLMMR5LywnsL7xC8LEmyRwx/qKpcD QY3RviFltfOJ1izUKnKVENr9lURPe5rLvK2NrLezl0Uydb9TEIDLO+CoRhEJ2UMKCeTi yXAVhV5Gan90R1rIuegupYi/HAFvrLOYe34uQvjSfFWfIpufGgPoG0sqLQr7dLlAU8W2 afFQ== X-Gm-Message-State: AOAM531RCiv3ZENJ7WwKL1Ase7XZAe5Itmd5ezx+b95FoxJmsVjcmqjy ngcACpFvn9HlVOafFqAhimLoi53vIQ4C5g== X-Google-Smtp-Source: ABdhPJxba9HW7MexcX6fXeHohvAyT7VMonoS4dO9kbUgu6wR8cNvzGBYnqBpfo2vUxZEKYp7nqdz6g== X-Received: by 2002:a1c:dd06:: with SMTP id u6mr449395wmg.155.1606160292774; Mon, 23 Nov 2020 11:38:12 -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.38.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:38:12 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:18 +0100 Message-Id: <20201123193739.1249300-8-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 170/191] avcodec/nellymoserdec: 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" Easy now that initializing the ff_sine_* tables is thread-safe. Signed-off-by: Andreas Rheinhardt --- libavcodec/nellymoserdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index d667d9ce79..49a21b43ce 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -128,13 +128,12 @@ static av_cold int decode_init(AVCodecContext * avctx) { s->scale_bias = 1.0/(32768*8); avctx->sample_fmt = AV_SAMPLE_FMT_FLT; - /* Generate overlap window */ - if (!ff_sine_128[127]) - ff_init_ff_sine_windows(7); - avctx->channels = 1; avctx->channel_layout = AV_CH_LAYOUT_MONO; + /* Generate overlap window */ + ff_init_ff_sine_windows(7); + return 0; } @@ -198,4 +197,5 @@ AVCodec ff_nellymoser_decoder = { .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };