From patchwork Fri Sep 4 17:20:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22097 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 35EE444B9DD for ; Fri, 4 Sep 2020 20:21:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2297B68B32D; Fri, 4 Sep 2020 20:21:04 +0300 (EEST) 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 955FA68AA85 for ; Fri, 4 Sep 2020 20:20:55 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id a65so6722277wme.5 for ; Fri, 04 Sep 2020 10:20:55 -0700 (PDT) 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=o/1XOoUgKJKwlRBLPyNmkLdwDP4G9t2U5tmIcxcObZI=; b=u80YxbYR7ceawNkMVxweEfih2/oCrN7IzzMzyfU1qWSbdRiRYOBdrV5cbla+LI6ue1 RfegmlWLwb0jqt0ysdz4hqEm+5YHf3NYTRJhnkz25OiI+v0uvB5XDyGcUScEjuarPh2q axfirXDQD78C6WriGzE+CPrYliu6m7ZcCzfwHKyYDjG5pfnZyOVSOLgb8fZF1LSRExBc F+sE0yL/rf8QLyuRhMXBvBWFbA8ad7EmlXgpUUSDkoLvUXWvI9Xet+roO4ReGePowum2 Jc5uEcfsdIXQR6qdUUhYzuF006000eEOoqcLaOayfjIP0GSeVQuHMEGPMpF12EQL5Dx9 IPpg== 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=o/1XOoUgKJKwlRBLPyNmkLdwDP4G9t2U5tmIcxcObZI=; b=TU60Hln99jQIwHGXcPNVQhrNgyeYRA2EvWwDCzmBPrgx4YGOaJMj5QsfbhsUEGl6i3 edsRKwqMRWRyRcH18KzQJCxuawSPV0vymwiJcQiYJyIRYBLxS3FrhecmKawJG3qE2yyG TXikegT1azilA5XDL6/H738o08qyqW1FBVxOXf211yxIEsAC3Kya9+iTjp7XgDIjfZa8 s6z6HJav/o7Xac3Txt9nb1Zpfx6h7UaL26aPTzMTJ/DAXan8zlgzL2QvNSCWBNBgKw/2 KPucRL/SHzokUMrPDJIci0yTZoeKFVhV69CXwJZLW1VF4N9ugPGw/n+B2K7sK6vuei7N 2A7Q== X-Gm-Message-State: AOAM5338Lsoc881JMvbaalLlwPaUfcxQxNoHqVUgrocZC3vNUwv3FR6B 5gUXsx/DIFedyvjG+GCWmF3OJqnURbc= X-Google-Smtp-Source: ABdhPJxQPV8t+8Q8wm2P+Oa3dO8BYED2TQBZ5AuLlUdQNtmmjfcvBzfr+s+/nVDMeeBE3wthXI9CXw== X-Received: by 2002:a1c:f30f:: with SMTP id q15mr8494565wmq.60.1599240054607; Fri, 04 Sep 2020 10:20:54 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id v3sm12282897wmh.6.2020.09.04.10.20.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 10:20:54 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Sep 2020 19:20:24 +0200 Message-Id: <20200904172026.28217-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200904172026.28217-1-andreas.rheinhardt@gmail.com> References: <20200904172026.28217-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/binkaudio: Don't use static storage for context-dependent data 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" Move it to the context instead. Signed-off-by: Andreas Rheinhardt --- libavcodec/binkaudio.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 012190a955..f17164da91 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -40,8 +40,6 @@ #include "rdft.h" #include "wma_freqs.h" -static float quant_table[96]; - #define MAX_CHANNELS 2 #define BINK_BLOCK_MAX_SIZE (MAX_CHANNELS << 11) @@ -58,6 +56,7 @@ typedef struct BinkAudioContext { float root; DECLARE_ALIGNED(32, FFTSample, coeffs)[BINK_BLOCK_MAX_SIZE]; float previous[MAX_CHANNELS][BINK_BLOCK_MAX_SIZE / 16]; ///< coeffs from previous audio block + float quant_table[96]; AVPacket *pkt; union { RDFTContext rdft; @@ -116,7 +115,7 @@ static av_cold int decode_init(AVCodecContext *avctx) s->root = s->frame_len / (sqrt(s->frame_len) * 32768.0); for (i = 0; i < 96; i++) { /* constant is result of 0.066399999/log10(M_E) */ - quant_table[i] = expf(i * 0.15289164787221953823f) * s->root; + s->quant_table[i] = expf(i * 0.15289164787221953823f) * s->root; } /* calculate number of bands */ @@ -197,7 +196,7 @@ static int decode_block(BinkAudioContext *s, float **out, int use_dct) return AVERROR_INVALIDDATA; for (i = 0; i < s->num_bands; i++) { int value = get_bits(gb, 8); - quant[i] = quant_table[FFMIN(value, 95)]; + quant[i] = s->quant_table[FFMIN(value, 95)]; } k = 0;