From patchwork Sat Dec 5 20:33:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24358 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 17396448E0A for ; Sat, 5 Dec 2020 22:34:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06ECD68A711; Sat, 5 Dec 2020 22:34:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C78D6882DE for ; Sat, 5 Dec 2020 22:34:15 +0200 (EET) Received: by mail-wr1-f48.google.com with SMTP id x6so4795211wro.11 for ; Sat, 05 Dec 2020 12:34:15 -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 :mime-version:content-transfer-encoding; bh=qha8hT7ZxbjPW3i2Ercf7xdN27WshRUKly5pkkN1ZtY=; b=UV8tpxtd3opADhHg3AwZWbbcVFuFkCZJgLt2PfxaBWoNebs9PXUmDxViglB3L343/f sYwP1tsUt1/t9T0Wb2MHmP/vTtWa4bDw02u2w+xHs16zp4Z5VVRQ/qfCkRFHqaNy0srJ RfnnAgbSgG44ufRuVilrxbmeU4gPr4gjjs8VPurb8+CWe4lR3KBFsADiDQNuOVmXEEOI jMdjivXMrjMTVO8YOIx8DnjJssfZm0h25G9f545V7eb5jWq79ICYZCmonG09q+PYOovm xsUgZmZzE1SmhvfSKluiiq1O8KN+53q1mmUBwcOFp6++dxTgZWy4xAMkyqpKdeoVJeZ8 hK0g== 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=qha8hT7ZxbjPW3i2Ercf7xdN27WshRUKly5pkkN1ZtY=; b=L0vsB6GVyOG4AxkxEe+biXCioOrDpUB3LTM06ngZW/d0i/6GiM2YHtb8h9U2fsioHw Bbr1EgZ/7wLCtQsmawqBcV4X29ltI/ghNSDX7d016ajDlzl7NA3BR9TJBmbZj3yuNstA 4VaEDdFPFHBo9wvNKJb9a93KSemdM6G3KJi07qyToN/4CcyW5vBDSMev8yA+wqEScVVD eWd6wnKhJqF6h39lzpSIP948uSChVFQWzo3CIIIkqvc+K6jvnaSrdhiJepuKxm/fyezh qnQscA+cAu8qGW5Mpk5aDJhU4UnuPK+jK+VItTa9ONm6da51w7FNSqZuCdBNnUX7OODi 93tw== X-Gm-Message-State: AOAM533yYy4sebnjtiAQTKAw1jpNjkBUxz6V5eiaGdqaBeqbEoy2wZTq zMrBVMpUIZvkWeACYO1SrIU4z5yE0jxS2Q== X-Google-Smtp-Source: ABdhPJwpl9IAYb+39Ph40j/ZS3YF1DOYfYasDI9KoGdHz+YaOPgJzcp3Gk9dO/KCaxXQAEfBDd64zw== X-Received: by 2002:adf:9d49:: with SMTP id o9mr11937038wre.413.1607200454388; Sat, 05 Dec 2020 12:34:14 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e4sm8747079wrr.32.2020.12.05.12.34.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Dec 2020 12:34:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Dec 2020 21:33:35 +0100 Message-Id: <20201205203340.19357-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201205203340.19357-1-andreas.rheinhardt@gmail.com> References: <20201205203340.19357-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/[e]ac3enc: Don't invade CONFIG_ namespace 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/ac3enc.h | 6 +++--- libavcodec/ac3enc_fixed.c | 2 +- libavcodec/ac3enc_float.c | 2 +- libavcodec/ac3enc_template.c | 8 ++++---- libavcodec/eac3enc.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h index b4e566b4ef..6d8f186a1a 100644 --- a/libavcodec/ac3enc.h +++ b/libavcodec/ac3enc.h @@ -41,8 +41,8 @@ #include "put_bits.h" #include "audiodsp.h" -#ifndef CONFIG_AC3ENC_FLOAT -#define CONFIG_AC3ENC_FLOAT 0 +#ifndef AC3ENC_FLOAT +#define AC3ENC_FLOAT 0 #endif #define OFFSET(param) offsetof(AC3EncodeContext, options.param) @@ -52,7 +52,7 @@ #define AC3ENC_TYPE_AC3 1 #define AC3ENC_TYPE_EAC3 2 -#if CONFIG_AC3ENC_FLOAT +#if AC3ENC_FLOAT #define AC3_NAME(x) ff_ac3_float_ ## x #define MAC_COEF(d,a,b) ((d)+=(a)*(b)) #define COEF_MIN (-16777215.0/16777216.0) diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index 879e364d4e..7818dd8c35 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -27,7 +27,7 @@ */ #define FFT_FLOAT 0 -#undef CONFIG_AC3ENC_FLOAT +#define AC3ENC_FLOAT 0 #include "internal.h" #include "audiodsp.h" #include "ac3enc.h" diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index ef23b417cf..45bfed34f9 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -26,7 +26,7 @@ * floating-point AC-3 encoder. */ -#define CONFIG_AC3ENC_FLOAT 1 +#define AC3ENC_FLOAT 1 #include "internal.h" #include "audiodsp.h" #include "ac3enc.h" diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index da5d67afc9..cbb7f63f79 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -90,7 +90,7 @@ static void apply_mdct(AC3EncodeContext *s) AC3Block *block = &s->blocks[blk]; const SampleType *input_samples = &s->planar_samples[ch][blk * AC3_BLOCK_SIZE]; -#if CONFIG_AC3ENC_FLOAT +#if AC3ENC_FLOAT s->fdsp->vector_fmul(s->windowed_samples, input_samples, s->mdct_window, AC3_WINDOW_SIZE); #else @@ -114,7 +114,7 @@ static void apply_mdct(AC3EncodeContext *s) static void apply_channel_coupling(AC3EncodeContext *s) { LOCAL_ALIGNED_16(CoefType, cpl_coords, [AC3_MAX_BLOCKS], [AC3_MAX_CHANNELS][16]); -#if CONFIG_AC3ENC_FLOAT +#if AC3ENC_FLOAT LOCAL_ALIGNED_16(int32_t, fixed_cpl_coords, [AC3_MAX_BLOCKS], [AC3_MAX_CHANNELS][16]); #else int32_t (*fixed_cpl_coords)[AC3_MAX_CHANNELS][16] = cpl_coords; @@ -124,7 +124,7 @@ static void apply_channel_coupling(AC3EncodeContext *s) int cpl_start, num_cpl_coefs; memset(cpl_coords, 0, AC3_MAX_BLOCKS * sizeof(*cpl_coords)); -#if CONFIG_AC3ENC_FLOAT +#if AC3ENC_FLOAT memset(fixed_cpl_coords, 0, AC3_MAX_BLOCKS * sizeof(*cpl_coords)); #endif @@ -265,7 +265,7 @@ static void apply_channel_coupling(AC3EncodeContext *s) if (!block->cpl_in_use) continue; -#if CONFIG_AC3ENC_FLOAT +#if AC3ENC_FLOAT s->ac3dsp.float_to_fixed24(fixed_cpl_coords[blk][1], cpl_coords[blk][1], s->fbw_channels * 16); diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index 00721aa645..585588a480 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -24,7 +24,7 @@ * E-AC-3 encoder */ -#define CONFIG_AC3ENC_FLOAT 1 +#define AC3ENC_FLOAT 1 #include "libavutil/attributes.h" #include "ac3enc.h"