From patchwork Mon Aug 2 15:39:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29193 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1679327ioh; Mon, 2 Aug 2021 08:39:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeQhIk+/Pw85w0DulHsehwjVDID1fWuuw72zsXkEcKiuAq6zsFq2m2/Juyzf/Lp/UR0I3m X-Received: by 2002:a17:907:2d28:: with SMTP id gs40mr16253206ejc.193.1627918797016; Mon, 02 Aug 2021 08:39:57 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g4si9607308edq.238.2021.08.02.08.39.56; Mon, 02 Aug 2021 08:39:57 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=VyEFbrCu; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 759926801CA; Mon, 2 Aug 2021 18:39:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075102.outbound.protection.outlook.com [40.92.75.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFAEC6801CA for ; Mon, 2 Aug 2021 18:39:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EnnIi/UQgRpCYy54kMPj8BGFYG8pha7KI4w0tNm5smPqGECm+IMUf/Wh1CznhphxfjJ9gFcFCAJjdXQPDnKC6SUo9Dn1TtN24A8awFICXUmhkaV9vP62Rwox5usmL5XFQxzoXLhYNEJdgDvk7Jm2/hSYH78g0ZYDSB/CKpZ4I70hLVMhSL6rQp0jbwvFw/+1NJN73fXqZpD7Ubt7ho0ciz/Ac6RStWM7zvj8qZ3jb7WY2r3S5kLl+2WhjG4bTv5VhTt3QL9jF6y2+QlEa9o8UOWirA16BdqXQg/GIb4GeUUFAlHmZEY9Qr6hcfdGAvMLZF61kLKpnTB4/GRc5wwuAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pixlG58M22Oq6LYVdZOzF7GV/05ViqwMux9ibERUORk=; b=VLXRygSlfVQg9eRTkV9+wtmp7XfeJGIgdQxQj+ARwtjRrjmsBWRGzn0G8HYTAphmOR8FY7wDKdvTQBO/glFYzoAgTLD84Vtcz3C10H3qxkF7Bb4fQw/6zmS9UYCRtKfl0eMlSQOByG7nVBvfF1F3l+i0FWWkN/UxEf3CQB8DxZtJVguHq4tBk8Tpa/u5CYRxJKL443AB9VMK3ZQuOzTfiJK4mVJHvdz4nZSTGX6p803hRwwz5HBgPcIkZiN9olvnmEEw/i6gWS2xk0kodVEDc3iI3MdXEjBt2D8LoZMaByXZ8yClVA0Q4KmjtzrmNlaLhzs6jQSyxd1MLbW61KRiXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pixlG58M22Oq6LYVdZOzF7GV/05ViqwMux9ibERUORk=; b=VyEFbrCuLjXEpzHSQIgw8eTC2G+T+L3aa0VOdARXeb7OsyIlI7Uz/7mEEUjav3gOmA891uI4eE4DB10BdOoUx+i9cV2XBUVozQ+T+7qmazhmZ04kYIqrUpLl0JWM1O0Yggkgnk2wOzfU/c39m/CfFll3kghsVwaB9UizUkQ98q9BNj9ZYQtTvkS+Oh4U2Or4i7gzOB0JX29LKqalDwqCUMcrHF10SHHvhx6Qch4F4y1ODJnJVR51badwKGLOWYZh0Uc5AiLCsme44MpAdngxiqPuAujWO49Ee3EaWUDXzZWwH4/f/OgBpoxex+oUlmLX4oOxQpD+A+bwTWiLSwjatA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3092.eurprd03.prod.outlook.com (2603:10a6:206:19::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.19; Mon, 2 Aug 2021 15:39:33 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.026; Mon, 2 Aug 2021 15:39:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:09 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [qAlsOw58sFM497+s6dtifDq8yz2jVsXv] X-ClientProxiedBy: PR3P193CA0056.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::31) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210802153915.1234499-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by PR3P193CA0056.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.31 via Frontend Transport; Mon, 2 Aug 2021 15:39:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35cd19e4-5a5c-4098-c46b-08d955cbb9f8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUytrrqT4o9623wQ4EiyPTqfoQcbwGgSQRUiktHaPhlDRz0JvGlEMUPBoaJKCg3w9yDKOG0ww1zYqfxpzmkh5KTAgY5j5ViVOR63fXTToyd2pcwXMKaCgoQSpsvotk6Xk3hNuIJ9DjwyjSczXcnQ8cILI5mngEym71rbDNjSKMZbobmQhm5Un8Uzl1pAgPQGWMYQPeUd+fJpbA+Z18kCnrlyRK/LEy2ZLJ8l0cc8W6hjATtf/RASVKWHFErSXSDwk9wqYKG6p1AOlJEwzhsbOCVf5PGHqXk6z04EiCRIij3YFrNvHyFUnC9fZH/zjhjFebpjUUWnb1KuT85+8yEtLAhvkKxOMQDej4oah+v66buQzP215L+oamCIAfLS0cF8sr9GLXZ1SqBs5LTA3iwW2EJECr1hhCl/S0+qmiOu8mGyGxwYIPe8CvuyvUOcgWF5F0xdwW1uP6HEPMgOxM+UkJk/Du1GXptDHP0qzWiJTtvdX5O1v+BHStjNYJ1nI1OMAvTliXEoSrx+zanQIP+qYLP03tJfUYCIVmERRush2k3/eRzPkF6nZ/mdct98QdAYgW71v1GSTIME9QgKn8Tm93gcfMRtVglhhlp2hhLygN7bkQesB+QTONoWC3YkH3aiEQd3jrj61OSpVBeE3yuqLGySeLyhNhsJzKaeqHnkjABap/sHAffuD77dlnsDtw0F1sMh7k8bBf9H8jRTuJ66RJGPwf0EMPpN0A= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tnr1EkeAXV+usyayx5qRQ7qrkmSO3T3oanKCFmiQI+yRckb3WTQLyryrL8+exON2DlxBkbaT5iNngEoKZ4gqDI4oj4VE+/Rn8c0LfArjusIq8gaUifIQccv251hcj5a0DdjPQ36yqjAWAqtrmQrZcShw51hEKbavYBpN1lPmEay6h5av0ig0S8xD35aG3yUbbQHaxKVwoa4tOhPITTPmFzuT+1osSDkf/jE2Hg53pLpYjCk1hY2CQsP4sM8mo/aMOOVHZbkWyL/gWC7mY5fFKGazuyhsYZ9utbMe3ETIZNxcpdGGtYHaX8VrXOO4TwPTkRziFtYnugxt7/5fhvI55fnWE0lSU3Tvr6eLzXNFJj4cT2usXdi+FaRj902EJFUcRhgk2rcht1Y+qST+zDwdvZWcWAAwDTLaSDq20iBbQpK6b42Zr4mWnknxgDTaOkok X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z7+2dxTQtHAkinCmqRtMoxaSHoHyuzM1SNUI/MUSzR6md+FPvTX6opB1VZZ2mUZGBGJuDDBYld7nz05gkn5i6ZKniEKFRqhqLVO/Ojpf3DfLPwHO29divPjNPzmf4VPcnpMd7JUgmNYoMhfkM7ktZA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35cd19e4-5a5c-4098-c46b-08d955cbb9f8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2021 15:39:33.8407 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR03MB3092 Subject: [FFmpeg-devel] [PATCH 04/10] avcodec/fft-internal: Make it a standalone header X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: fTazWBqvoQKy Signed-off-by: Andreas Rheinhardt --- ppc/fft_vsx.h uses sqrthalf (provided by fft-internal.h) which uses M_SQRT1_2 which it seems to get via fft.h which includes mem_internal.h which includes avassert.h which includes avutil.h which includes mathematics.h which provides this. Several of these inclusions are unnecessary, so I add these headers here to make the header usable on its own even if the unnecessary inclusions are removed (which I intend to do later). libavcodec/Makefile | 1 - libavcodec/fft-internal.h | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index be64c82c66..9a6adb9903 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1181,7 +1181,6 @@ SLIBOBJS-$(HAVE_GNU_WINDRES) += avcodecres.o SKIPHEADERS += %_tablegen.h \ %_tables.h \ - fft-internal.h \ tableprint.h \ tableprint_vlc.h \ aaccoder_twoloop.h \ diff --git a/libavcodec/fft-internal.h b/libavcodec/fft-internal.h index b0d8d80efd..d89a3e38ca 100644 --- a/libavcodec/fft-internal.h +++ b/libavcodec/fft-internal.h @@ -19,6 +19,9 @@ #ifndef AVCODEC_FFT_INTERNAL_H #define AVCODEC_FFT_INTERNAL_H +#include "libavutil/mathematics.h" +#include "fft.h" + #if FFT_FLOAT #define FIX15(v) (v)