From patchwork Wed Jan 6 23:13:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24816 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 3F40144A498 for ; Thu, 7 Jan 2021 01:13:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2986668A2C6; Thu, 7 Jan 2021 01:13:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CABFB689EA2 for ; Thu, 7 Jan 2021 01:13:48 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id x16so7273241ejj.7 for ; Wed, 06 Jan 2021 15:13:48 -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=qbCBsqg86n1F3NSU0akkaNaWfGc3BrQ7fVR3Y46BQqY=; b=UXVTQaPlQjQMtKi9bw/JMlaWmdf518jfLH5F+c10mVy+GtawAbJC8U3DwmanWWOKiy cJWLkPrSBh3EoB9Dr6t/PPnwHJrrRr+JItiZK9Fjb8B69YsivpM8QeSJBJ0O0E928+p3 GdPHZjwAx1ACyrIGtnsbqo++e1wPlULjVTmqPgDqcSqWepNi/Bh+58OpKXm00nG3yTsU fD0xLfipKCmn1B91QR1ohOVEovoKyZLJH9ywigYd6x7nElZwIlKocsON/1fr3/va7Pnj 9yPnVoEws+1bHKHhQ+D+ITtI6BUws0WVCdhElTcKrUjp6xXh1mTABbGEQN+oXWuOIrex AHzA== 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=qbCBsqg86n1F3NSU0akkaNaWfGc3BrQ7fVR3Y46BQqY=; b=DLsDNFCyRGjNbjRPdPoYaux+MhrQ/iqUAeSYrTRivm3sEckNBrhwy793sB2nA1yuSZ NE2WUpdVs2kNpHjZu+PzE9vAoZpcZBv9VKH5zOLoubJZnM93AelwAnKBaZnhBFBtJELS S43Jlt3imUEORNzS6OTOcQYb87iv4+xrYBx3mk4WylJeoipC5GNfnFpEgHDkPvMEDWTg S+KoKMC4Lx4u8Y8RZpZwJ/gMYSGEq1vEzBPRDOj0Q3XgGNONsWdRWqXZ5AHxfa7khf+q WKILPX/I8dut7QeuoCsj77uA+8pXoE6WJxlwu9tsSRFzNc8ca56UVICksRaz6n8wKjiW do1Q== X-Gm-Message-State: AOAM532V5B9wbpMGX0dUSvMTiEhOyt751mlsDbS3r8ihGY4q01H5Q+Hj fkeETPEToeCmCQC/XsD6KuQYHCUwyV0= X-Google-Smtp-Source: ABdhPJxZ5LwE8EoIa+8tl6Cao8qy4EfZMlbvwunCnNUYy8xuhdhch2ofPmkgbM9ZsTQFaSTwYKaTfQ== X-Received: by 2002:a17:906:386:: with SMTP id b6mr4232772eja.554.1609974828150; Wed, 06 Jan 2021 15:13:48 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id b7sm1794295ejz.4.2021.01.06.15.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jan 2021 15:13:47 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Jan 2021 00:13:07 +0100 Message-Id: <20210106231308.2952217-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210106231308.2952217-1-andreas.rheinhardt@gmail.com> References: <20210106231308.2952217-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/fft_template: Only check for FF_FFT_PERM_AVX on ARCH_X86 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" Also do it for FFT_FLOAT only, as this is the only combination for which it can be set. Signed-off-by: Andreas Rheinhardt --- libavcodec/fft_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/fft_template.c b/libavcodec/fft_template.c index 9d125de073..ddde63714e 100644 --- a/libavcodec/fft_template.c +++ b/libavcodec/fft_template.c @@ -251,7 +251,7 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) #endif /* FFT_FIXED_32 */ - if (s->fft_permutation == FF_FFT_PERM_AVX) { + if (ARCH_X86 && FFT_FLOAT && s->fft_permutation == FF_FFT_PERM_AVX) { fft_perm_avx(s); } else { #define PROCESS_FFT_PERM_SWAP_LSBS(num) do {\