From patchwork Mon Aug 2 15:04:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1665126ioh; Mon, 2 Aug 2021 08:21:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5rQbPvvdQ6AzIY357L+FoQjek8IN3HWMfzOfJMYnuVqqP81pPx4TUxyU8n9jIjyaOhO9B X-Received: by 2002:aa7:de92:: with SMTP id j18mr19823759edv.141.1627917668710; Mon, 02 Aug 2021 08:21:08 -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 j23si12210953eje.551.2021.08.02.08.21.08; Mon, 02 Aug 2021 08:21:08 -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=hFMUC0c9; 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 6C36C68995F; Mon, 2 Aug 2021 18:21:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074042.outbound.protection.outlook.com [40.92.74.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B0206898B4 for ; Mon, 2 Aug 2021 18:20:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=In9cegcoybV13Mbjr4TbAyr6/eH1e4XeLYCS8bhFtZzLHS99+e5zYCYSmaNrfdxSf6639l2S/g964m97nmS109KvB6p8SFqwXghWHtXWlatP2QwkjmJWRIYjauhXxyR1LJm1MQHBiY5vJu9HWjbM17fcIyvk+yB8fH9XQ3vrizGL4cAzseEhySfQydbIQagIOcp3TdiY2W0b1P7L8srxVg+yvLNOTVhRRXHEpRuvrgGQVALEof/EBneoYC5vaBdrqeWxL0jkVlFw9V1j+P+V+vepyxkZxtVM/2h7ZfZAAGDmKKflSS75/UQPQH4N+fDFplhOBi2YA1yer170MAMdNw== 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=NEfP0Ez3GI658Eb5VcX3IfOQ/b04MJ1g4jQM8IeWua8=; b=TZVHYPHwCETWL9XHqRAEbn210cQH0BJ2gzYyHpxQQAQ+u+oGMwg8HiacAZtCXxjKRZkiQb+OAoqH+FxkNVmrEipIWGPbtzwpATS42VNGCDCxFO7hE8C2L85ROl72GwO6B6RoBIclseCzdLQrd5xdQpvU24v617q3hChOXfaX1ETD+07o0gAQ4YOj5wYbza3A24P4v8s2yFW5yTPF4ffY3ppfBqPHA9aTcuz+gYuqrtLN7TqwB9Zdks1hhc3trV3BPpOyF+qkYP+znsVm8HeudIAymyiTMSfRlDkBzihqhD5YwGKGfPZeMYIQ/7x7HqSWu9hpGc6Me/Yfk+qp0JHvRA== 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=NEfP0Ez3GI658Eb5VcX3IfOQ/b04MJ1g4jQM8IeWua8=; b=hFMUC0c9kZL9jwlyF/RhtwIkVxvz9vaoYyw0lrWHZEwH1LnroGbmCghGroSmdYF6rfOebURzeQgeBotOUcoESH8+w2ozMlt4q/MoUygklnsO54p9qVbej5uyS1och2uAJg31C5Y44Qa4Oc8i++tsIT5hCd+XqnQS9AYFcFX6JnIOHXoQ8eeQrMhl1+vQ/AzUKB27UFDMdlUSohfGAPhftknkN3J7pj/X3EiBzRDQenPplMtu5q6NFjqCRqNftjKqr/4yagpgZk+Z6VzyqUqgZ64N+qMIFoWweDFq3oosq4Mkbw+rNyJZ5r+exknncF7qFzfy0mLCTw9Dxf38hRo3pw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18; Mon, 2 Aug 2021 15:20:55 +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:20:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:04:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [8BUGLs6jJHCZYBZ9dQC04PRahwttBSIy] X-ClientProxiedBy: AM0PR01CA0129.eurprd01.prod.exchangelabs.com (2603:10a6:208:168::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210802150444.1163748-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR01CA0129.eurprd01.prod.exchangelabs.com (2603:10a6:208:168::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Mon, 2 Aug 2021 15:20:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80597220-9b0c-4440-844e-08d955c91f6d X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKZ9xd8l9TNBGYujMBuJ4SbjiWlqRzoKy4LGdkI306rJ1c65VcBOszjcI1GFYjIpkGvdXxE0IY744NfOIbbTaAHrYHN7YKJomMh2ikf0J2/JURIhwDH9YFQz1jwbntUdJNVxn/sB8bPJHTqLx9giTJ2VRzhXKaiGsFBBZICcmgZW1kdJHBf9e/c0NSyDXXi9l+/Z5Z/GwMGabw2vkOEPzbhzT8nycvxNF2gN83a26r+moIqKxa/2BYTD/UjVcUUgjydBxXx1cNW9pzjNzP58Z6/6cadyXKJXZ0CQVOCusB0T3OHVaAbtM4V6l+Big5EbD5/qhvjcY7wU/XbyYAy2/5LDqLvBmctC8AkM8lCdi2gFWkQlNJmU24mh0qIZkUYrYsYcvo0CkVp/vELkubPgFnSO0R0yrOzf/s5+hyLyNkyZm+UdZB/l1zBWqcxqSs+6yM7Nynu1Rfi++7oSPDBhTDPriQc+CEmIDSZyvlPMEwMeKMWNpj1HhJf/tndeLnaPFMPa//igHMnANLbDPy1pip6kxyYWSqsGxXoFqZr1cPctLvbzZEDQFcStEFBPSA0YSV4NdghN3QtmQbs8RMHBmIWz2Qb+y/mJ+vmKdtCQFUvp+SsImLNETTNGpn0eN9It4//CLeDEc/b5aN10wvkswVtKIE84Y8BR4GT3PbVBw6nGONdR4gD6xuMA8r7HjVhYktGHy5PazmQfQ== X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vkUqCFw1qPDn1a3gs3C7FQFVO6ZbrB0FdXsQwrn0aQpgRvmAmnCdNSmplneqL2D2+KQBJxsdoiLJH5BhwnmH90R84tRzr5y7YogIRlNYGQ2sDW8UBAFpAYgWI6u6nCYKrpyU5tETySMK/a0aPwhv/5OK3ihgaXEDMxjaXX+6VCaMjSDYai5e4QRJNbkH6d6md/zsW8FR/Z04DNcflzjeyt+7IL1rlBxxJDIeFBg/7FRcCWnSDkhVdkzld/7rqrVuAfEjALEHY7Cq/5h3M71tndzvEWfPM+pTgH0K5CLQhvqYtbr2C/fK/r1uCqTX9bdJAdorjMG4717DRi/UVw/2c96XLJlK4Gg+Nlr82PorAWPsjaSrt9pFP6fMUc/ZD689QZ2BgPPivtLGkxNeEKzR2K1Yg9Tlvg8xzEdrqVa4RZAro3ExRI/04zAh3LWuiDcx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8hYjJhPi7gnwZvehesrjznURPO7+f+cyjElbN2LeIA5t/q57YghzAkEFCLHPp87nD62aHtgET89wCzFTsQO0nnft3G5MSWVA2qTlMZQgWMFJrwjhq8/CM7O151EZzSp2lm1V52zlUd7NJJBI3PJxBw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80597220-9b0c-4440-844e-08d955c91f6d 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:20:55.8363 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 01/10] avcodec/mips/constants: Include intfloat.h in constants.h 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: wJuJaoJFXefx Don't rely on the user including it (mostly indirectly). Signed-off-by: Andreas Rheinhardt --- libavcodec/mips/constants.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mips/constants.h b/libavcodec/mips/constants.h index df54b3016f..f6eaf4415e 100644 --- a/libavcodec/mips/constants.h +++ b/libavcodec/mips/constants.h @@ -22,6 +22,8 @@ #ifndef AVCODEC_MIPS_CONSTANTS_H #define AVCODEC_MIPS_CONSTANTS_H +#include "libavutil/intfloat.h" + extern const union av_intfloat64 ff_pw_1; extern const union av_intfloat64 ff_pw_2; extern const union av_intfloat64 ff_pw_3; From patchwork Mon Aug 2 15:39: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: 29198 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1679083ioh; Mon, 2 Aug 2021 08:39:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4i9pnLpg3iqpUjRMW0eCKVlkN4wy7HPSaP90XeoH232wX+wxIktCTz5uoBIF2fQXjJE/W X-Received: by 2002:aa7:df09:: with SMTP id c9mr20445548edy.379.1627918775378; Mon, 02 Aug 2021 08:39:35 -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 m25si9720852ejb.570.2021.08.02.08.39.34; Mon, 02 Aug 2021 08:39:35 -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=sbLvJx4z; 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 50AD56881C8; Mon, 2 Aug 2021 18:39:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2018.outbound.protection.outlook.com [40.92.91.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2727E6881C8 for ; Mon, 2 Aug 2021 18:39:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SOmRZ0r34qk1bqUDXVILpSxxdDw4wEIbI4nJTrF7Ka53yPRk7FDXKcGksBLWDvIF2mvqIVt9+sJP/q3CNkEBN1ahyqKHLKYWNRUbG4kJ4YfE3JY0G+joniwUqNU24oeqRUCiyS98lF9NwvM5nkPG93WOs8sWWLlAil64uFK4vS7tXd9Eg6FzNvpyHBstIlLJPuckqw0mF7YUcEvEiRtpU1kuTg22MOLpGTY3L589TMmSa0wuPaRHlkmyqRDK/AkZElL9SQJz7qsQnFTA7jlp88aCb57cTptfUPKW2xmy5YnaiHmKgaa7s3TPsnhDhq2kY9L2W+hOPQ/kHY53h68ZIQ== 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=cY9bhvLaTZJCtqdkfDgD6hGoPqC5zlPqm6y1o7gNRm0=; b=ma/jn7g6IiUYGI48cVWEJzETSty0HfC6MBtAVifUBLPk9aA2vDO35sL/jag+LNxWy7BbISeSqe4yg+GPibMFajeuRk0KAlUKzZKFJMvioonN76kk88p/6fEBgheA5SoCo6xsKxQTOkDvUyhubOd1imArnCODokGDAI6gMr4Fh9F6Qi8hDLYV4Yy7ePFCUobD8K7Tt9kA42xfSgIORw/VvSNkNyDAFKFtmoTtrjN88JD0c2zB+QGGPtaYkbyvtz9/hkiVTB3lFLvSuatEEPgpzRjU9D9q0MJBbZy7B+aBDLi3zfvKfdrsO06iGKcZuyGJ42Y5cs0RMUJHzjZ5Bhul7g== 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=cY9bhvLaTZJCtqdkfDgD6hGoPqC5zlPqm6y1o7gNRm0=; b=sbLvJx4zQ7/Hil+6EFl7dzRgrwER/plDFmPX65LqhsRxsLHvWw/zT1gAhQyZZ/vjJZBv2nB/3muU1PII1isyBX8CemTdR7dau/am0cwV2N4s9rwgDhpC/tnfehHtuWVD/CuN22XnXNRhTvYQs6ueF0exLKxQwR6O1AkpB7q4gJN6XAbT950VFKDVBSk2ZfkhwgnjWFMTdv/toeCOx1wiMrsbCU3OuY1ucq/NPfhBN7uJSqblAC29emDJPLaEaExRUfuuP6LPLHTc7WRDoB/SQ8UlgZyULwlkldoCIs429ZY8uXvZbT5Yc6FYhRuuTvkq0p8DXmSDGYD1mZR99NZmOw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6327.eurprd03.prod.outlook.com (2603:10a6:20b:137::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18; Mon, 2 Aug 2021 15:39:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:07 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [hFYY8Q8c/CME3dgYfC/KG/q+y/Eetmyv] 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-1-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:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2dc30b0f-497e-45a6-119c-08d955cbb3cd X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKZ9xd8l9TNBGYujMBuJ4SbfeHyA98kngM6eC9CyrzEGmOCtAL1YQ46pgo/b6YHVqP7LYfTlNYpYa9iWel1QCikee1nLdp7dxkHvWIItY/5EuT0Aol39xR718sfwEePiCrAtF1Mq81nY+lPXmB35mWjxe/HUyhpwl5xQ4eFRtcr/1nYRwz6/ZhPoUKo2UsBgYLTiTlBcsE678VaKijueSOxhhI/mPBPpI1rJUS9UEk7Stpp6KnAinEz+aQ0GLJnXIfd+rx680do/0Wm0wJZTZqaZgAtpeS1TxyWB9sxHdfEBOm9i9kjGsiulI7FZ9hcLe6CUFFM244gtNXJFWKFjG0NLydE1IKp01JCBR86TaI36HS6SDfIJkbQJ6UScy6w9s+P5SjRll5RTJ6bByeY0PW93ryxTEAX54AwOEHz1lCMcNA3wcjKfFjeSGT0OLAPkm26jbeEjTzu/Gd9tCXtydZxKJ+MlXaE2oSOqUxugKOVxKmnvoPtBrrYRFn3QsyIjlbc3XWV52l86pGk52VGdvCSw+rvv9cvh0NmM1eMgz2qxsxhiP44DFdTzq/KZLf+l8cn7VIlK5+f2RyM8ep1pxKjtScxq6KRUUdv4HgBdHtkQW1PrxPyvo/ViLwX+vTuknCsNGVKxtkKFU2zRp8kbog/KouJNTNdxzkYtxhhrSPj/cmv/9RHs3O7wScMi6GXlRneTLPFgQ+2ug== X-MS-TrafficTypeDiagnostic: AM7PR03MB6327: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: meUR06LCpYEmHUoKHsmm5Y/sQMfYMroH9v+uI7DZ2MB5X0HvNBxL2toFmJ9eNUQROPcvexonIfKCxA66fE2utsMIPsIGpRb8WMQ4iod6nKmYmDmkxNlTI1gqApTYWBB6HvAV5EGGUBVMa2vwxjCWWZ9S79FZkb+R1LQBFdRoYrV4deO84LMELUaVHsLfgxGC7RaS0lHurW9TFxV8oH2/LMjC5rKLFvTXYZOkKx1Jw9VMPU7bBzbCrub0A4iWdBy80fRoxxtPK0QUKVvNylJ6FYhcjDjDeGq9FXyUVh4tfrZoQgOJeOgOXag2vj8C28tU9AMCQEvAszdbA1lI1+/yCvNeLILy8u36lPH7J2ziAvFMJ+/lbNdRnMzvklrsNBWyWlccq0hanvDv62WvXbgLggum2GxIjAl5LdNREoG+z08Q08trgrghLiaxqTdTF/pM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TjSZU/f9ypLx2OXt1ronw4QI/JbbzxJFg7m3hINedXA1/fjXT6/eS7Z72+FlyzIi/XdUPwmxG0zxNCB88xySNFodFCeaQz/d2sMkGZGEtdLCbe0lCpU1Mkzenlw22Y15F8WW9k54zVrEL1xciMTV1g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dc30b0f-497e-45a6-119c-08d955cbb3cd 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:23.5965 (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: AM7PR03MB6327 Subject: [FFmpeg-devel] [PATCH 02/10] avcodec/fft-internal: Remove unused macros 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: Aqvyl7x9xZVZ Signed-off-by: Andreas Rheinhardt --- libavcodec/fft-internal.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/fft-internal.h b/libavcodec/fft-internal.h index 3bd5a1123d..cd809578ce 100644 --- a/libavcodec/fft-internal.h +++ b/libavcodec/fft-internal.h @@ -36,8 +36,6 @@ #else /* FFT_FLOAT */ -#define SCALE_FLOAT(a, bits) lrint((a) * (double)(1 << (bits))) - #if FFT_FIXED_32 #define CMUL(dre, dim, are, aim, bre, bim) do { \ @@ -50,8 +48,6 @@ (dim) = (int)(((accu) + 0x40000000) >> 31); \ } while (0) -#define FIX15(a) av_clip(SCALE_FLOAT(a, 31), -2147483647, 2147483647) - #endif /* FFT_FIXED_32 */ #endif /* FFT_FLOAT */ From patchwork Mon Aug 2 15:39:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29194 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1679221ioh; Mon, 2 Aug 2021 08:39:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsehjbZW45Umn5ht4A6BTQQRI1muPe8f8kU35aOwj62cXO/rH2VOotl/xRvJw+bG0zIcDj X-Received: by 2002:a17:906:190c:: with SMTP id a12mr16361104eje.141.1627918785647; Mon, 02 Aug 2021 08:39:45 -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 l21si3707070edw.175.2021.08.02.08.39.45; Mon, 02 Aug 2021 08:39:45 -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=NL9kwnKX; 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 6952168081D; Mon, 2 Aug 2021 18:39:36 +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-oln040092075039.outbound.protection.outlook.com [40.92.75.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A30568081D for ; Mon, 2 Aug 2021 18:39:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R+nVcbhF1hYfriaX66UEsK4QyGJ3cipv+UCRpR8N5V/UifF6im3mSUCDBaszGmAo1M5BVfMXvjAOc8kLN0Qh9+6vY5NJMBOr9/xHMc+k5YKhUcSs8fi7wywwEhozGQ9yJmyHHjfUYEkgwf7ZVCw+1dvcWaGFpX4TH1rc4GLUCTvo52M56UTwVgHbx3HhizHyGUaVzww7XF87SDpD8GDI0N2FjTiK42UQ8OUV91YOFdO6S266XABxvGDtI8JIGxDjTK35Mb31axJPKuL7O6kaxFC5azCUoB0dfVsmWvBFz9n/acWH4b8IJtONdFdVFD+3X1iPx2qoFVWT/6vbf2JCXw== 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=ZmveClcCxZHMMfvczFSa4OsMZ4DFCYjdOjHzLwD6tbw=; b=oHRvfoXetrjDrDZab6PUwsyg83LA2Q62P6qYf6YpMTX9nKzm95+Q+QjMBbgLQs+SVkN8mSu9QKRD59uY8IYUCN5FiPCeMZ1dI65syCdE03AzlGOThxqSLwKWpkJMXWCpHTQA/yCbuu2DBOiAs92PucUOYg1vaV7LqhBfwB0zjj5yyCGfEaj4BdGWozituHtqMQZER4J/C+H5ii1pvd2UWkkmTzkybxd2HM8kOJTX0f0S2sMUjEBbKzuHpNFSNW7Yrv6WJdeUDvZDtVhBbycAMafcMfkdSbdwPI8y3OQgVRlzTsf+zXn5zoiTaK4QBgAdYMWqAsIAegXJw5mM0Ctawg== 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=ZmveClcCxZHMMfvczFSa4OsMZ4DFCYjdOjHzLwD6tbw=; b=NL9kwnKXihRZPTFSMqUKtqyJrVD0G/Tg1vUzsNnYr6uZUXf6aEko04ObPzlAsGHGk7wAilHi7E+9kpWKAQVfGACN1HKxty8lhHRUjB89QxFyWMWBAyydjrs3v7WQQxr/a4TvQfKGzeq7x44aTQtOCr+Mj55s6gMUPBbQR9LMpIILwZVt5Qde37AlrGcsSZMOz/tTQFxPvQvQmW2Z1ZA4QLw9qRvI7tYaHOTtmona0amvGEIRk9eIiTlSCf55vDKWa1tUZwv5xkdI+s29ibH67OlqININ8SBo2b7WUeUMlVWuYtVaCWvVfiH3PHu8jlG3UxlDsVJ5lknTVbKT7EBHpQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3089.eurprd03.prod.outlook.com (2603:10a6:206:1a::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18; Mon, 2 Aug 2021 15:39:28 +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:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:08 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [r95UF98fhUWC9PaxrJyOht0x3HwCsNV7] 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-2-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:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7d7bac02-2856-4f4e-4127-08d955cbb673 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUytrrqT4o9623wQ4EiyPTq7KZdV3bkGyLa7I+pbo7xpLHGwwbru8t8rZJ6s7Dbzjd3rnYNa50X0/xvs4BdMufr8oRY0nmKOGtLGLxq95Ox0RHpo3K1V4suZLv4YEJOJNO01E2x/qaERuqDfJBTek1s9df2/RawGR0iUf0L1cdVkdYzY9xSY4Cai7f/QnwhsudaTZtYN+F44L4uuEZj8YpdYKvyG3mj6XCPq10PM7fDHMX31C1KEc5lnr/k3g6Y4Avrcew90IivbFeU8UnFRv77rl2rEWaiHkzC/RxjpOibQJ80ChNLSsD8fww5avaIx5XuEHcKTzuXy3zB1+dSYqHgDpyZWCLuaSnZ4aH/71+Kx77KgFvbpmxmkYp2vQ64a+eNBv7Xei1Wv1+OTiAZeuov7iNeiioP2mtUPcai7V2MibR8Ew9BH8USss0ES8+dNIhL2VJDuEnj07D/Bo/YdVeNuYQFH1gUpBZzQnb9TfrcxCU//+oooo+KAzDGtG1DaQvvZVSLNWdAXND04tJYmvLs7dlCYUmAHeTC73bsGpKTbFCPZ61A6f4OERkoJdWCr/dxf+wbkvaSXQNNwV4GmumAtNmOB0tLuyDGmXK4GPhgZqcKDIZiJ4vY8ZvM0faQv0zWzjah62QKjdhkW8gPNcnfw8pBG4vPerRY6u6LmcDVbBUwPqMPuIJ51X7bWV3qsmP8bDNMGn4HQaTdkZai0sEDzg2PzckV4bg= X-MS-TrafficTypeDiagnostic: AM5PR03MB3089: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BzDs+A+m5SMoHULAMh4qPbaylKuagfc5+dCxGGKyPDoEkH6rSoNub93VzP2A176T6+LBN/5hQWvf81jBcigvQalE3Qxf6Y8W6B2hDPNHAK3I1Wedg2qcpTgZ+ei9sqkkB00E23LmVhWAhhWqadiuqQWzXMHcyDwfn64ORwnh3/40zr2gzbLsDEm2JjLmMN7Q8LcD35O7RQniiV4fwpVcG3pcPJJAVbhUW1pRoTAQjfYv/ps66JpCn2ll3EjMGrDsIeYvhhuoGo4/92tPlsUOOF8onH209W9BCzSgd+d/n8CkiOgnbZVIYijhXvbmRYDPv5YL2Hm/Zejq38xpWN0I6nC+TrHkEC5z2W2brXCpeDQapquWsOwNZOg5Q4cJwoxcPAMtHBvCxQDk/kBhkQ9vCZ+93gXv+Kmh6l03OvtRsQk3VczQyxQgczuBvFcay+1j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VxodQeWVkRitWqTeZSY9rkhtLwDhsMwo9uplIdJOieO9vHIw9POwWRR/AqZB/2BSvRg9Q0BsGZZb7NiHUJZ+11pozREoRFjq+948lOC/wHnXFbf+lLF0CwPrzk/kUEE0RgsPGevH+E5+HOSK7ldCqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d7bac02-2856-4f4e-4127-08d955cbb673 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:27.9634 (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: AM5PR03MB3089 Subject: [FFmpeg-devel] [PATCH 03/10] avcodec: Remove the FFT_FIXED_32 define 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: wU2Bx7X4R+nt Since the removal of the 16-bit FFT said define is unnecessary as FFT_FIXED_32 is always !FFT_FLOAT. But one wouldn't believe it when looking at the code. Signed-off-by: Andreas Rheinhardt --- libavcodec/aac_defines.h | 2 -- libavcodec/aacdec.c | 1 - libavcodec/aacdec_fixed.c | 1 - libavcodec/ac3dec_fixed.c | 1 - libavcodec/ac3enc_fixed.c | 1 - libavcodec/dcaenc.c | 1 - libavcodec/fft-internal.h | 4 ---- libavcodec/fft.h | 8 -------- libavcodec/fft_fixed_32.c | 1 - libavcodec/fft_float.c | 1 - libavcodec/fft_template.c | 20 +++++++++----------- libavcodec/mdct_fixed_32.c | 1 - libavcodec/mdct_float.c | 1 - libavcodec/mdct_template.c | 6 +----- libavcodec/tests/fft-fixed32.c | 1 - libavcodec/tests/fft.c | 6 +----- 16 files changed, 11 insertions(+), 45 deletions(-) diff --git a/libavcodec/aac_defines.h b/libavcodec/aac_defines.h index e94475ac54..a3c680b65c 100644 --- a/libavcodec/aac_defines.h +++ b/libavcodec/aac_defines.h @@ -30,7 +30,6 @@ #include "libavutil/softfloat.h" #define FFT_FLOAT 0 -#define FFT_FIXED_32 1 #define AAC_RENAME(x) x ## _fixed #define AAC_RENAME_32(x) x ## _fixed_32 @@ -80,7 +79,6 @@ typedef int AAC_SIGNE; #else #define FFT_FLOAT 1 -#define FFT_FIXED_32 0 #define AAC_RENAME(x) x #define AAC_RENAME_32(x) x diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 3ce5330c06..4dfb38ac83 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -33,7 +33,6 @@ */ #define FFT_FLOAT 1 -#define FFT_FIXED_32 0 #define USE_FIXED 0 #include "libavutil/float_dsp.h" diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c index 00257a5478..cad2fd6adc 100644 --- a/libavcodec/aacdec_fixed.c +++ b/libavcodec/aacdec_fixed.c @@ -59,7 +59,6 @@ */ #define FFT_FLOAT 0 -#define FFT_FIXED_32 1 #define USE_FIXED 1 #include "libavutil/fixed_dsp.h" diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c index f6c2810ce5..8645952621 100644 --- a/libavcodec/ac3dec_fixed.c +++ b/libavcodec/ac3dec_fixed.c @@ -49,7 +49,6 @@ #define FFT_FLOAT 0 #define USE_FIXED 1 -#define FFT_FIXED_32 1 #include "ac3dec.h" diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index c7632d78e1..80aa98c691 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -28,7 +28,6 @@ #define AC3ENC_FLOAT 0 #define FFT_FLOAT 0 -#define FFT_FIXED_32 1 #include "internal.h" #include "audiodsp.h" #include "ac3enc.h" diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index 71a76bc356..884ac896d3 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -22,7 +22,6 @@ */ #define FFT_FLOAT 0 -#define FFT_FIXED_32 1 #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" diff --git a/libavcodec/fft-internal.h b/libavcodec/fft-internal.h index cd809578ce..b0d8d80efd 100644 --- a/libavcodec/fft-internal.h +++ b/libavcodec/fft-internal.h @@ -36,8 +36,6 @@ #else /* FFT_FLOAT */ -#if FFT_FIXED_32 - #define CMUL(dre, dim, are, aim, bre, bim) do { \ int64_t accu; \ (accu) = (int64_t)(bre) * (are); \ @@ -48,8 +46,6 @@ (dim) = (int)(((accu) + 0x40000000) >> 31); \ } while (0) -#endif /* FFT_FIXED_32 */ - #endif /* FFT_FLOAT */ #define ff_imdct_calc_c FFT_NAME(ff_imdct_calc_c) diff --git a/libavcodec/fft.h b/libavcodec/fft.h index e03ca01abf..706c9d07f5 100644 --- a/libavcodec/fft.h +++ b/libavcodec/fft.h @@ -26,10 +26,6 @@ #define FFT_FLOAT 1 #endif -#ifndef FFT_FIXED_32 -#define FFT_FIXED_32 0 -#endif - #include #include "config.h" @@ -45,15 +41,11 @@ typedef float FFTDouble; #else -#if FFT_FIXED_32 - #define Q31(x) (int)((x)*2147483648.0 + 0.5) #define FFT_NAME(x) x ## _fixed_32 typedef int32_t FFTSample; -#endif /* FFT_FIXED_32 */ - typedef struct FFTComplex { FFTSample re, im; } FFTComplex; diff --git a/libavcodec/fft_fixed_32.c b/libavcodec/fft_fixed_32.c index fbdbf847e2..e18dc83891 100644 --- a/libavcodec/fft_fixed_32.c +++ b/libavcodec/fft_fixed_32.c @@ -48,5 +48,4 @@ */ #define FFT_FLOAT 0 -#define FFT_FIXED_32 1 #include "fft_template.c" diff --git a/libavcodec/fft_float.c b/libavcodec/fft_float.c index 73cc98d0d4..a9fd01978d 100644 --- a/libavcodec/fft_float.c +++ b/libavcodec/fft_float.c @@ -17,5 +17,4 @@ */ #define FFT_FLOAT 1 -#define FFT_FIXED_32 0 #include "fft_template.c" diff --git a/libavcodec/fft_template.c b/libavcodec/fft_template.c index 3012372a74..0bd64192cd 100644 --- a/libavcodec/fft_template.c +++ b/libavcodec/fft_template.c @@ -33,9 +33,9 @@ #include "fft.h" #include "fft-internal.h" -#if FFT_FIXED_32 +#if !FFT_FLOAT #include "fft_table.h" -#else /* FFT_FIXED_32 */ +#else /* !FFT_FLOAT */ /* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */ #if !CONFIG_HARDCODED_TABLES @@ -136,7 +136,7 @@ COSTABLE_CONST FFTSample * const FFT_NAME(ff_cos_tabs)[] = { FFT_NAME(ff_cos_131072), }; -#endif /* FFT_FIXED_32 */ +#endif /* FFT_FLOAT */ static void fft_permute_c(FFTContext *s, FFTComplex *z); static void fft_calc_c(FFTContext *s, FFTComplex *z); @@ -226,20 +226,18 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) s->mdct_calc = ff_mdct_calc_c; #endif -#if FFT_FIXED_32 - ff_fft_lut_init(); -#else /* FFT_FIXED_32 */ #if FFT_FLOAT if (ARCH_AARCH64) ff_fft_init_aarch64(s); if (ARCH_ARM) ff_fft_init_arm(s); if (ARCH_PPC) ff_fft_init_ppc(s); if (ARCH_X86) ff_fft_init_x86(s); if (HAVE_MIPSFPU) ff_fft_init_mips(s); -#endif for(j=4; j<=nbits; j++) { ff_init_ff_cos_tabs(j); } -#endif /* FFT_FIXED_32 */ +#else /* FFT_FLOAT */ + ff_fft_lut_init(); +#endif if (ARCH_X86 && FFT_FLOAT && s->fft_permutation == FF_FFT_PERM_AVX) { @@ -312,7 +310,7 @@ av_cold void ff_fft_end(FFTContext *s) av_freep(&s->tmp_buf); } -#if FFT_FIXED_32 +#if !FFT_FLOAT static void fft_calc_c(FFTContext *s, FFTComplex *z) { @@ -470,7 +468,7 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { } } -#else /* FFT_FIXED_32 */ +#else /* !FFT_FLOAT */ #define BUTTERFLIES(a0,a1,a2,a3) {\ BF(t3, t5, t5, t1);\ @@ -620,4 +618,4 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { fft_dispatch[s->nbits-2](z); } -#endif /* FFT_FIXED_32 */ +#endif /* !FFT_FLOAT */ diff --git a/libavcodec/mdct_fixed_32.c b/libavcodec/mdct_fixed_32.c index 5a34dfe760..eaa6355e67 100644 --- a/libavcodec/mdct_fixed_32.c +++ b/libavcodec/mdct_fixed_32.c @@ -48,5 +48,4 @@ */ #define FFT_FLOAT 0 -#define FFT_FIXED_32 1 #include "mdct_template.c" diff --git a/libavcodec/mdct_float.c b/libavcodec/mdct_float.c index cff2d211c4..3d3d3a5548 100644 --- a/libavcodec/mdct_float.c +++ b/libavcodec/mdct_float.c @@ -17,5 +17,4 @@ */ #define FFT_FLOAT 1 -#define FFT_FIXED_32 0 #include "mdct_template.c" diff --git a/libavcodec/mdct_template.c b/libavcodec/mdct_template.c index e0ad9f1e53..a854ad2700 100644 --- a/libavcodec/mdct_template.c +++ b/libavcodec/mdct_template.c @@ -35,11 +35,7 @@ #if FFT_FLOAT # define RSCALE(x, y) ((x) + (y)) #else -#if FFT_FIXED_32 # define RSCALE(x, y) ((int)((x) + (unsigned)(y) + 32) >> 6) -#else /* FFT_FIXED_32 */ -# define RSCALE(x, y) ((int)((x) + (unsigned)(y)) >> 1) -#endif /* FFT_FIXED_32 */ #endif /** @@ -82,7 +78,7 @@ av_cold int ff_mdct_init(FFTContext *s, int nbits, int inverse, double scale) scale = sqrt(fabs(scale)); for(i=0;itcos[i*tstep] = lrint(-cos(alpha) * 2147483648.0); s->tsin[i*tstep] = lrint(-sin(alpha) * 2147483648.0); #else diff --git a/libavcodec/tests/fft-fixed32.c b/libavcodec/tests/fft-fixed32.c index 9fadd8a59c..3c50bf1dc1 100644 --- a/libavcodec/tests/fft-fixed32.c +++ b/libavcodec/tests/fft-fixed32.c @@ -17,6 +17,5 @@ */ #define FFT_FLOAT 0 -#define FFT_FIXED_32 1 #define AVFFT 0 #include "fft.c" diff --git a/libavcodec/tests/fft.c b/libavcodec/tests/fft.c index 83f2ff2a08..9a5e5bd1c0 100644 --- a/libavcodec/tests/fft.c +++ b/libavcodec/tests/fft.c @@ -68,14 +68,10 @@ #define RANGE 1.0 #define REF_SCALE(x, bits) (x) #define FMT "%10.6f" -#elif FFT_FIXED_32 +#else #define RANGE 8388608 #define REF_SCALE(x, bits) (x) #define FMT "%6d" -#else -#define RANGE 16384 -#define REF_SCALE(x, bits) ((x) / (1 << (bits))) -#define FMT "%6d" #endif static struct { 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) From patchwork Mon Aug 2 15:39:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29191 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1679440ioh; Mon, 2 Aug 2021 08:40:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaRUWB6xr7CpuzD33bh5SmQ2IBU9Y19mXnchliV7vMH9X0VGL/twrs65dgKzoXeiZYrAnY X-Received: by 2002:aa7:dbc8:: with SMTP id v8mr19619462edt.242.1627918807994; Mon, 02 Aug 2021 08:40:07 -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 z26si13521445ejc.486.2021.08.02.08.40.07; Mon, 02 Aug 2021 08:40:07 -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=H0vuCCI4; 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 89117689CCC; Mon, 2 Aug 2021 18:39:46 +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 03EB3680836 for ; Mon, 2 Aug 2021 18:39:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tq+oATi+Fg7LnBLktufk2Q4BAy1jR9UGK7bjYIpt8fFXiyEggyZvv2A71iXbJECiMGI160jJgk4kVsVsHR88iwakIkc1qpcG/KJj/l6Bv5Bj7NyosqL4+IPnG/YZ+Frg33lP4X+B48BENcBZqFLO6ju8cyq4q0eEwVTLywFpKwbCSCHonOgdhIYxwz1f2J6BN1b12MPbMFBG9vx07yQhILayON3DMToSjwC6sG0bYNdA9Vk6QNRkqMONvWVuhHcvTuDo6aPeEi0z6R6sd2y8uawMv3ULaFG6PDWFdTVC+r/m1JQTWRsjVNVJUoK2BZwywHN7WpTz//xLboXQDZCGlQ== 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=t/AC6rLPghCVNExyRGS2FVp6o293e3DMV23xvONr9oc=; b=YBkUtzSnSNruXh3szNPq8TF7hTi3sJyrNP2eqnDS56KCKr2URH5uNgeQdbdzP66Kr3i2zpL9dSQcMu8ypUFiQDsNiZnbjavF+D8ljgypRu1sr3EDbkTUJYOXRMFOktIyaMyi9LKXOcWNoYkNfSg3ICV0WxNNuo9PsAsibieNE7FOLd+Z9+r2HeQ56nRyn908lzgjJDWEugc54gcH7+Pp66jvA6gs9AGHK9pyeMuA0PksJNOlGVJl6e3RAu2NCrzLzsGVQJaiq4h1s8O1F1ej6TiUHffaP7AVBVNQMgmA8EBnunS9DfUV0mz77X4DyOg7hMPKZXouZt65vMLujzA1YA== 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=t/AC6rLPghCVNExyRGS2FVp6o293e3DMV23xvONr9oc=; b=H0vuCCI4CrxwUdb4Q9zxsvMU0v+hSaYI+SIqyICQSDQ3PK1RfOHMyI+xyWOv7BxaGqimAJmQOjpLn0rnY4WiUSJQ+Y+TlxaMKUK+Ri9EE0IVnIDCpNqr6Za5VOi8TU6Q/j3FGiwH/jtUZq36UoQt4Qa5tSHn5zixd+4Tzc1j+e9279w/UlsOELBdyyHtJ66b+gBpXCJW5jzCKujgV8W1953vqwjFZipyGFldYt6cePZDSaFKFu12GGUItADfVRdCXZx45faCef1eebhykSFLSO0SehmxNDFwN4+uw/vqr1DDYzBwe0e4XkCI/9DK10Nk0Jqjn/h59urPFgnDWr4DlA== 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:35 +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:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:10 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [sSNoLMGN8SNq26ivi4osV1iqhVX2fGlp] 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-4-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:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a1291f87-b54d-4578-6749-08d955cbbaf0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT7FzPiew9v5CevtIP+WXD7aPXGzCw+OUzuOCWI3ZLkGZrxRuAR0dsve342nUiGZtIxJG47M+xGT1ToF3xsiUZsyXFkAjHHKVyTxAX0ibYdaL6RXAXEWEs5TdiUML9mLCizKDcoXsjJg8kw70VLPYAnFUmsva7MIQu07fqGfRhXjhz5YAwIAqbfhn13Pa6u6TWI3FtJD03nmegI48rlGCGTiuBX/JtccjukVFTlQP1S7RTKG1Uhgh1xWt6RiSL8TCB5p/Q++d7NCcTL4IvYfCOdfQpIoPrwSK/47xLqyiHXmTc2z8X47g1E785vDTUtjdufU3qjBJmV/AjiKTspCHu85XnFLSXCuDvYEd33qbTsNKIFdoGntkXteJL064YevnjsfOmmH+MilC/PG68GCljs7Lf7QlgIL0IB/1O4S0mm4CeyKyWN+X9tGrKhdUobXKMeUzPTjNcsxZYhQgM27RzpQEHFu7zxyNdaM+1zrCc5AQyvQ2McmZ5DHgof/kNm0gtNrvw4IPXApg56/vJovyzjmAhCoScRqQZ/8dal+CRxykErB5WzVmi0sIj0zl/CX9EgCwytFHCS1FqdL9NvxVZ1Gfs3UUI1Zdb6IDpiagThcLduYgrmXof4+k5NKmSayMY41rNZimyAVDGDPv6TipmkP1RY5Yrw/1t605IUBLxaWL0QMJQkppkEW831YDJDP4liXRuIYxvWflGTRnAAQEukFi4wbEoBn0YEdr/+m4xjKTdk9ci3cQHIZtmAQBpYJUA= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 32WuzyxnU1b44o+D3MM4poUKuYUef/QjNhBxq1F6tBCHjAUuv/B4QqBXMDziBW+mDL1mAbh8S7gglbBOTQkUyyDDNqmFuXQttHAU7WU0cm/EPUyTNFy5SZ/RP8LRH4scWM5abHx8Ku2qF9seEPrNgbTanGMx09KdbNUd0foVjhNWB09iRzV+LHREm7kk+duJGfWW8hX2QEXnUS5ozVGQmIQrlcI3mUAfg1ZNqCEBemQO7Knmog3NgFjmblqQd9/zQG4+NxkzsriOIN5Mic161tU4N4TMKwVUmwSmKNeUooONGf6oMUH60jt49sgPK5CwZYyjjbnYfRDcorZLF2Hs9cZe37e997Nmju0HnhsVOueAxLQQbKa+hY5rwA2qlEszEDnGGYxK/6uwMdoOKalpHmgEpBTYz2FULYex7lpdBMh1JOAMkSLOvjIrs662s8F9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VwUG/b5oEzUq1DOJ0XAo8Fv24VwJR6CNYPNih/zRN5eELSkUtEkKSJqgSqUGIMqKPoklG2BqTMafeVngE66WhvgzGch+a9QnYESkrD18lsXCZwD+6MRBeHgP/ty6egyICltln02+L9MX6/kRxu0hnQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1291f87-b54d-4578-6749-08d955cbbaf0 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:35.4606 (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 05/10] avcodec/huffman: Use logcontext instead of AVCodecContext 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: XCXYwHgPC3it Said AVCodecContext is only used for logging; it furthermore avoids an avcodec.h inclusion. Signed-off-by: Andreas Rheinhardt --- libavcodec/huffman.c | 7 +++---- libavcodec/huffman.h | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index df1141b7e7..be351ba2d6 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -29,7 +29,6 @@ #include "libavutil/qsort.h" #include "libavutil/common.h" -#include "avcodec.h" #include "huffman.h" #include "vlc.h" @@ -154,7 +153,7 @@ static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags, int nb_bi * nodes size must be 2*nb_codes * first nb_codes nodes.count must be set */ -int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bits, +int ff_huff_build_tree(void *logctx, VLC *vlc, int nb_codes, int nb_bits, Node *nodes, HuffCmp cmp, int flags) { int i, j; @@ -168,7 +167,7 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bit } if (sum >> 31) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Too high symbol frequencies. " "Tree construction is not possible\n"); return -1; @@ -193,7 +192,7 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bit cur_node++; } if (build_huff_tree(vlc, nodes, nb_codes * 2 - 2, flags, nb_bits) < 0) { - av_log(avctx, AV_LOG_ERROR, "Error building tree\n"); + av_log(logctx, AV_LOG_ERROR, "Error building tree\n"); return -1; } return 0; diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h index 4f879e6e84..1d5e140e81 100644 --- a/libavcodec/huffman.h +++ b/libavcodec/huffman.h @@ -26,7 +26,8 @@ #ifndef AVCODEC_HUFFMAN_H #define AVCODEC_HUFFMAN_H -#include "avcodec.h" +#include + #include "vlc.h" typedef struct Node { @@ -40,7 +41,7 @@ typedef struct Node { #define FF_HUFFMAN_BITS 10 typedef int (*HuffCmp)(const void *va, const void *vb); -int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bits, +int ff_huff_build_tree(void *logctx, VLC *vlc, int nb_codes, int nb_bits, Node *nodes, HuffCmp cmp, int flags); int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int n, int skip0); From patchwork Mon Aug 2 15:39:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29192 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1680189ioh; Mon, 2 Aug 2021 08:41:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmNigjGlh9QzLZhmfwp9+DVhFCYpjMmxyXZC6HUYT7kZMT9QfeDcwmQrfoQKdjUpds+Mfj X-Received: by 2002:a05:6402:34c8:: with SMTP id w8mr19937570edc.182.1627918863695; Mon, 02 Aug 2021 08:41:03 -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 um11si10589405ejb.419.2021.08.02.08.41.03; Mon, 02 Aug 2021 08:41:03 -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=QkHUKK1T; 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 772AE68A000; Mon, 2 Aug 2021 18:39:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2045.outbound.protection.outlook.com [40.92.91.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1E48689CDF for ; Mon, 2 Aug 2021 18:39:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GruvoMnrBWEWGtFv16Lnv2WwvlkMkerOv/FJtzYSty7Tf4ZjHPInOZQrW/q29kCeQZF2KXpRhAA7k+2+/Ab+lV9Ze6p98kux/hrKwPcmk08jw381RAI+Sb5a6Jxa7Zn6lHOg2GN6CUU6r2X3CYURU6cRDI8HiKRivUgLYrGm4AER60ZJbDfKJCLJi8e9RNWDp3cU5IcOW+tPffsexV8/WxHIVBnQ99CfdfeU2QNL5UpbyOc361aknTJdzx0hQqfQQu+VevJDsFPJijgtvYI8wwQ2rG9bNvRZmazunSydwb0Ul+wMXJYuKaVzxZIIGa/xAuRJtPTmgIPzm5tX6bP0aA== 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=NX4Z0EONwNjI/Z5TXQ8Bc/zQLIddby1deP+wpv2XFdg=; b=FKOH2RaKiCiF5d8N7esd4HDBXWL5o5RLrjYSfMJUGfqap1qxAIxqoOf88iPRCDt+eHAIwzmv0n1gz9cZhZTgI+BnmFOTfXfuNVn7C+Vi5vKkKoa7LYB6ptiG7GaKBeONRPNsCwAfkJVv7967xBA/cvK6nAbNXzzkZ8Ku1ilr/dfNLu6BIMVIECqFYwLnjGaichoQfpaWzVIC7sm5Jpj+IPhQ+sTe6IRZIM/V1LF6jU2xvfxoCKcjZunO/o+IeKYMb5z+EokR/SJsrd4poio0CnU/QbP+2nx8E7zDeEeZU8G/c7csJhXtj6ZNOHCkAACUlkR9W2lVVnJ9Yr26Lot4mA== 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=NX4Z0EONwNjI/Z5TXQ8Bc/zQLIddby1deP+wpv2XFdg=; b=QkHUKK1TnulTp6b4iGYqx04iP4Pf7lhRHbTgOA1+MSUAMvov84PBbU37/iwCahAX/v3HVngTQ1ETo+l0NuKP//op8u866VNdWwPnHID+eFfowLQZIgOsnxSW1HJehf50M4daQ13FTuwkJK8njf92wE75yF2kUaCGRfFL0dTBOayq1YltwWK6O6fXTUBZ7Y6vUv+1T0ukkPIUTOrsKgPkYQFOBjzhWDDXic20eW59Ed7xYR2s9T6D7rxblpG7xOcmMh2k/fXEFvNhfon8vrSOcP8eIhhgAlKw3A2cGDHuavILenIVMNfRJP+45ulxwEQFTw6fJd9ofZ+8f5WM5K2iqA== 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:36 +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:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:11 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [LNLvKwyM9uWQhZgt6DR/AOiSqtY7ko2/] 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-5-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:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9864c374-1cf9-48e9-6390-08d955cbbb89 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUytrrqT4o9623wQ4EiyPTqpcU2deAY/K8cdAxQU/+e4VHjn4FM044ARXEZ8quuCX2570Bz8sQX/uj1ypPnvNqyokhR0leaKZDQ8SOVIddq/HEqjODL+m3lsnssnP0S4nYD9ukVfBlQ0IUM0099MBTKm/ttOfR5Cl6w5mqRi7jqjTu49eTPEhOImlrbwZNNIa9+IEfEP8DVmWDEJvERIUWHwTG3L+inFgv6x5xwCWS0O/ZIhUZHUsm8GkKxNZq2IOFvsH7yFSnyyn5D1T+QzBunnm5r5g7oYzNFL2wOnK5I8htShpQP3m/LWQ7wVJPuuU4SHwxDKxGul+hmnxyx/9zanMTUhew+arpdcXyA5JdZET69LQnoiPGBNV+JOdMzi5CZw7+tnFGjb76weyTAHQVZXfM676ejfVV1adRy/bD5NR2SC4jWeRY1IcuIK+XbEtThWlY0VlWo+5jg0AUptQCvzfGQEre0WlNeg1WfqW9RGH9wtm1vvcrMuxOnJF/j893zVRlsl80/7NQDSwIwdVlUpK008XuaGtumzRk4es8FidCTIwjXgmqEAXXu7kDJ5NYVQZWitKS0I3PF5Rn4Ew2iMx87se11Av9dpMtZrerjXb++Qtqxu4fvlU1wMUlAqTg8d4DvyzrGYvU9lJsHRy39GlBV2g0vdZSTLFIYAH7vG355j9XyrzH6lJ2b1OhnhNpm2MgDB7Nd2Oz+iFkt7xcuHhH0A8Z/0/g= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QYXDexrhqNVXlSVPqjAANXlTvPoMUp8EMEsrT6s4SCk2w0oJzPcqOZhpQEo7fjaeWCLCZBzj8ciAXi9AFaAW7xjCVb9S29xieF2cY29ml03ETSj7eQnuiVSTMR8JTxjhcXCUlLe1gejFAc0PSMSb4c7bK2L9PZnebCzAVS2GMqM069spqz3I+kIfzkULrMFJGz+6TyWlxGuPMjoPmuWOtuTFsnzKmjHrA5ZsCp8QqNUaukuQdnpEPIq+fY4S6R0WWIQjZ1j8M/w9WY5A/faApkTUKJIpuatK7PeCds7AjGQFiKvhdDvawqPIK8WJvUmYkXK8u7WFPzfaaCoF3kdbAweuO9mw4EtjCYa+S+DsIbmT6ae9YI6avWT4BmboAcVWEfQpwnWbE6Zxf2tpqFiU3hmBVluogHbmg8auVNm8W6uKy+UZfWK8KaHb+q837sm0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GYdTSDGy41wBJyV7esC4McPJTWaifdHNr2RVgNllzPqg5a+rBnk0vxXIe7K6Z8nTkmtKJL6aC+uEEXrle1iZp9ZRv5RQyubukmlSEdHbB1oPNsonoQdqBm3Btag47CNjbWqn6jzWECWSbNvdorm0mQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9864c374-1cf9-48e9-6390-08d955cbbb89 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:36.4582 (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 06/10] avfilter/internal: Move ff_norm_qscale() to qp_table.h 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: OPtBwFjrL9HT It is the natural header for it. Signed-off-by: Andreas Rheinhardt --- libavfilter/internal.h | 16 ---------------- libavfilter/qp_table.h | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 1bcfb830a1..61a1279b2f 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -343,22 +343,6 @@ void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter */ int ff_filter_graph_run_once(AVFilterGraph *graph); -/** - * Normalize the qscale factor - * FIXME the H264 qscale is a log based scale, mpeg1/2 is not, the code below - * cannot be optimal - */ -static inline int ff_norm_qscale(int qscale, int type) -{ - switch (type) { - case FF_QSCALE_TYPE_MPEG1: return qscale; - case FF_QSCALE_TYPE_MPEG2: return qscale >> 1; - case FF_QSCALE_TYPE_H264: return qscale >> 2; - case FF_QSCALE_TYPE_VP56: return (63 - qscale + 2) >> 2; - } - return qscale; -} - /** * Get number of threads for current filter instance. * This number is always same or less than graph->nb_threads. diff --git a/libavfilter/qp_table.h b/libavfilter/qp_table.h index a552fe2e64..4758ee8538 100644 --- a/libavfilter/qp_table.h +++ b/libavfilter/qp_table.h @@ -22,6 +22,7 @@ #include #include "libavutil/frame.h" +#include "libavcodec/internal.h" /** * Extract a libpostproc-compatible QP table - an 8-bit QP value per 16x16 @@ -30,4 +31,20 @@ int ff_qp_table_extract(AVFrame *frame, int8_t **table, int *table_w, int *table_h, int *qscale_type); +/** + * Normalize the qscale factor + * FIXME the H264 qscale is a log based scale, mpeg1/2 is not, the code below + * cannot be optimal + */ +static inline int ff_norm_qscale(int qscale, int type) +{ + switch (type) { + case FF_QSCALE_TYPE_MPEG1: return qscale; + case FF_QSCALE_TYPE_MPEG2: return qscale >> 1; + case FF_QSCALE_TYPE_H264: return qscale >> 2; + case FF_QSCALE_TYPE_VP56: return (63 - qscale + 2) >> 2; + } + return qscale; +} + #endif // AVFILTER_QP_TABLE_H From patchwork Mon Aug 2 15:39:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29199 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1679549ioh; Mon, 2 Aug 2021 08:40:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkcqgxaNAb/vWFw+kPidowESakn8oYBdGlLT2tc1Zy5hFcTwlSXaxT7IYZhOcNHN6LVHHv X-Received: by 2002:aa7:c7d0:: with SMTP id o16mr19896700eds.75.1627918818988; Mon, 02 Aug 2021 08:40:18 -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 z15si2166324edb.227.2021.08.02.08.40.18; Mon, 02 Aug 2021 08:40:18 -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=t82IaQPw; 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 891D2689D6F; Mon, 2 Aug 2021 18:39:47 +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 8374C6898E0 for ; Mon, 2 Aug 2021 18:39:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=chmJbvkA8P703JagD4uKqFc+Yaya4lF99criFnEaRtRhjtM+ZpCAy8qqNB3MNXyS+HFqSn5no0BxB0Z7MafGlyG74WlQTa6DoS+YQifRiS6fOeig+bxdMKz81RK6DUN/5rlOhJFQrs4DnNN0zzRcmY0usEE4Yv8dFsQFIQj4iXoORCZwk6LRfz8WbJeiporvlcYw0DmRU7Sld/Mcwj2NwgQwmWr3eGU9IGYcUhkZN2QkQIFdYJ/JCmege7uDVcjx4Mlf9oAc+FlFWG7NKS4sl/IWmpek7KT8pL+s/+G7+2+BfGUYGNkPUGEkX1JDApUl9DxB9EWanDzKlC4J2HSeeg== 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=BeCDQVrwRWIyGab5sm10ps5hlJWYhXQZSkw35Du0XIg=; b=gSN338sluYDJtYcbho00ETrpuPqXTM1qw9BKVaLbeDqBpvdifGBl6kGtIviq7aw6+BzlrAy8qSpgbCDhNbWH2AuonalxyjzEQSeIguV0FqjTAS5YT3cDBhK1rOK9BAx0LczIqa3dTjrDD40ZvIgKA+7AnCRFJkYDeE7YkAv3EYWZIMReqBWYOV21hanUmObFHKYYjCfMSLmznunOv6W9pvHxk0ZPy5q0Y1ipRw6hhyiXV8IHRUbfqu3q4z58Y4J4AWUDUNjJ+ZvNEUCQZt4ReADeigVGll1v2rtyQmkQGOX8LQd6QcQwuT4NnPg/q8Y+7oDxI+KEV2zBY61msBVcYA== 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=BeCDQVrwRWIyGab5sm10ps5hlJWYhXQZSkw35Du0XIg=; b=t82IaQPwQzEozK+yPM5sAiDiCQiuqREed6vmy0/Zps+VWkhe/qjtBtdD6Vh3ZMXDECtu/Ditp1CASFxmDDIwgu/pdGq2cZeNJFWsH/WJ+Scpb0sCUssHaly9gsfhmBPL2ZhLVbJQ3X+GZI7eaZTzW6JSaCqhMDBflJAadoLpNMf5ae8ImeayQSnP7aGE3tFCsBGID4s6Jjb6BXEgz13k7C+n5d6A3ye7kwlM0jN1RPwY+iqCRLfpwTn7aWZanGfSKRgRJGfS7wuej+kpQhVTOxpMRXkjEh06wrZfTcT32EPJx2TcBREilNh6ULdx284GUx5SfeBxw8BW5VVqOD3tRw== 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:37 +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:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:12 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [nQ1KKMY+UMinLYBZPr5f2zMfi+5GSf+4] 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-6-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:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97717b11-7cf2-4a8c-4fea-08d955cbbc21 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUytrrqT4o9623wQ4EiyPTqpaoYkn/Ii1ogFUE3nwI4O2d2Q7ow+CVAjcHxw5NW5QnkXw0J84STK0NzTkhPYb/XFK4nyLzamxjcZ8E0R5i/bMbW/VKlJhwgr5Mg9XJiqfd3tMnK5P4NT+OrWL098AiFhfA6Bq3atQafqAY5JZsM2+jJUzfU+IqZ8Bx6LsCsnDorI2P4IprRT4K5skaePR4Y+PA1I0oTMNf4l09rZD7vey2NGAAEE9989Uj3IHn8bWyp4ylZCb1uiXSiAV8mYK6ajb0838axfZH3Nroytq3dQ59awxYvq2G9Qs9m8i9Ym5dTfjzGI7xVIIbPxK83Zs7iM8jUbSpsLlvgcTyB6aAqnTWcGydB5Sg8C9F2g2c0TP+IyqPijJchuAM3LotMC9tYuVblsAkYVL9GvVnTgP3qxRVRcJs4foxjub1PfaRv3wNrJ1IVJbCvSXD9o94YaxBUIOP9u8B9vgW23NaSF2hsu/qMWDVawdWG11yWmE65oRzcrfcayPKz3FSAjdV3xCDOwY0cylm+S2SUVlpWByFdnYqIgQAY1otxpN92fe3wZi6hPCrtFj1VXg/I+o90Kg5pfz1MY8/UT0FNLyLuqaRTYiz3DIoYBCFIK30wyjy2M4+f3EH8dppcdJU/INmpr7LASsraExsKzMXPelt9HIqP2OdSHfu0imidLtR0d1kvE9+hScQ+WVBA24pGL0pIhJ7SnaoYHWDSwJI= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +P67266HTF+DX8ZqXfDk75Q8FTCpgQDqhYg+SoKy1chD61IcbgBCJlgfr8IL5UcFDzC3AyHLjwUa+mO8+LwigXxUby2nqzek6zp2vPNubo7aHqt9hdaBgzg+TWzsmfZHl0i57g2PpXT+cSfEELTQQUwBpGBAZ7IO0yEFGBM1WlINJ8B858pxIGiWvJDh3/hAa0muF/gDIWc6R9GCRBXDtzfMOQpR8ws/UsajDAe6Qvtt6Ve/lnsKBozbmgW6m58VPqxM4RRABc1kfp1uUX2bGUmgGF1BzhzvJJjVomfIYUE36VnbzTzewWzRo3ejI0M0ZGugjG03Btjukc7LehOefAj6mu+VCHMI4kfNkShlKWYrku8z18H6DzX/LD2SrYM4aGGU4R15f8DWyt7R7nOmonNXcGPLxVPUa6UJza7hZnM8XvSBoaAfXDa52AkMBXNc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CMTW6QBxDWohDOvSSwgEKGdZ3Wj/A3lZ4FXQd1D5sJHzRRK38mfuTKOudqn5ovfbxWajfZhdsmchJRwkdBvgirTidLLimMqZBvUwDLT/iJLUzyXnbF1o4Moll+Y559r3ofxLWkmMD/yecuXVO59OSA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97717b11-7cf2-4a8c-4fea-08d955cbbc21 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:37.4957 (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 07/10] Move ff_tlog() from lavc/internal.h to lavu/internal.h 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: hvZT/ZItVcI9 It is also used by libavfilter and it is only natural to define it alongside ff_dlog(). Signed-off-by: Andreas Rheinhardt --- libavcodec/internal.h | 7 ------- libavutil/internal.h | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 1921515bdd..dc60e4bf08 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -91,13 +91,6 @@ #define FF_CODEC_TAGS_END -1 -#ifdef TRACE -# define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__) -#else -# define ff_tlog(ctx, ...) do { } while(0) -#endif - - #define FF_DEFAULT_QUANT_BIAS 999999 #define FF_QSCALE_TYPE_MPEG1 0 diff --git a/libavutil/internal.h b/libavutil/internal.h index a33e8700c3..d8a1f2672e 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -198,6 +198,12 @@ void avpriv_request_sample(void *avc, # define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) #endif +#ifdef TRACE +# define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__) +#else +# define ff_tlog(ctx, ...) do { } while(0) +#endif + // For debuging we use signed operations so overflows can be detected (by ubsan) // For production we use unsigned so there are no undefined operations #ifdef CHECKED From patchwork Mon Aug 2 15:39:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29196 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1679724ioh; Mon, 2 Aug 2021 08:40:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuSSNooMrlREnpfOmNP5q+sYapLe7I7TBTzuFcQ6vIF9aSjIse3XYBh/uel3yDBRglxwst X-Received: by 2002:a17:907:2674:: with SMTP id ci20mr16434593ejc.84.1627918830543; Mon, 02 Aug 2021 08:40:30 -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 j7si12055404ejm.280.2021.08.02.08.40.30; Mon, 02 Aug 2021 08:40:30 -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=sZzGFyHw; 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 93FEE689E3A; Mon, 2 Aug 2021 18:39:48 +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 A2DA8680836 for ; Mon, 2 Aug 2021 18:39:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BrQPFbdl+lugeDHVdtWs7dw6qWpnO5DZCb50HA8arV7HuYW4RMF5mOLCEqC469kZQpsI99hPVUGH0O7ylBlh+XOPABpVLsZPxgXfdGps9M7NiO9S7T/APiHqWdYV7WD70RjC1fxtg5LYv3SL+lZ5SEBqKG9MyDOtdPXGEVDPRIM/tzGfp3I0UrARFvM216oi+QpUQqVOKxSqX84rl9fT4QKiBF0MmU+PwhydAx4CMkgjTzDEe9WkBEkp6MePpzyGZfE57PvwNZxoDLAOqOZDjX59jFoBoxV6UQ9p4ug2snKuxO3VXzr6zCp38wxd+PR1CVAyU2r0sWR7xB1Idyv0mQ== 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=EA60qJ6lNq6CkN/TG51ZebVRV9IrK0hhqeXeajMHga8=; b=gliv7wsoyV6VKf+CwF25pyCq8PKiXnlW7YiU70c/rAn6pS6TmL8kD/Vihh0b5+KMQr66970Ti9eCA4RlF/cHv9BLV/RpBnH8c9e9JPGNMa1l35L2SODVNjs4/AxDgvGjULjDqn1ItNctqX12owtl2YZQ0dEiJEmu2IUnDQ1g2ZrGqtDnmsOuDWS7uihTtcucw5CGwNZZqMzLBMDAtuJwZ8U+gC5UimVqwqRWg91H/5TO/XKeN06xEWnBmadCRhYK9koMM/uxfASRya4/UUEZfUMm47CsOCf++nXT2YhWRzqixbpXBUwWX6NpaCSvUUT4qEnr/sFvSANtMmY+SL4ggA== 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=EA60qJ6lNq6CkN/TG51ZebVRV9IrK0hhqeXeajMHga8=; b=sZzGFyHwVropeYEzUN8fVR/ybvdKWcoYGSQGXDEQtqnHdYef45hGFBDTczfdE/PFZwJ+i1BQH7sVUFUyPDXv8jdh44ASTDo9hHHctyNPtzr3uDqyMskoXFP7sgSgHpkXdVWpkd5PooAm/6O69y279Kc0JcVZ1gIPwCx/CpnyKg3SbuUpDyZl7eKpyNG+ekPzmG72YEB1Ifthy1dJEvhf97OonTkZHlocD0Aj/3aux3rU00vlbD3m17UOD7lgab1OYBApm+PqgmvZ7mCWbaLxTqa/c/tH9bqqH9zV/20axFWxwI2TzCP2b1mJbtX3CI6hhh6L/BI7nBtc/98DWBkBXg== 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:39 +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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:13 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ooJV97+yA1WrhJLuBF0UYF6Fj/3WU+hm] 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-7-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:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fafd9a7-230c-4d79-dbd8-08d955cbbd19 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT7FzPiew9v5CevtIP+WXD7qLwzOECtmPmGfZRIc9nIj6DBFaS/UqUGNo0RuWDVuurIa3AA2trjv0oVrEav/uyWMipl2PGdNsCkOInhuDfBph90s6OXlV2KqHrvbGDuUtbmHOAPBB13eS6IIMVemDIwQexsFji8unmOTagywiwP/sAaP20pMVS/J485qfXmlX0OOQHvPcQaLnjLzbgrpSxtwvpdtfFncY3rTkyeKpy9SHNwhjFYZYw6/v7qLSkuWRv2L1BKWMeDFP414TxEaj4RkyyuP/1ZHWbIz8H0MMxDgIXNUZ1ZATTMPV+BxeKtUTfVpReX8pOFsPqONLvZ4USU4unNmBJCa2CCdmbOm19zAx3xIIt++V2DuMHD8hDybGTr6gu3pXFKz5ZCACyXhFBapTNDFL2yjXopV0DYo1GFhEG7LZ7e3FOli3mNqbbtj2MKHn3rr+sNAsXJ5S2ZQnDRKmhiaO6pRCmOeb1dLMpj9D/tmW8Qq9T8cbRjoo6x4JBAguENHRFBCyFQmpOQZaithBBAXyVJk3iRNNaRl/wwJF6rz+TUkEAhfYLMB2P3NHUKaVpeKcobLy7Hw7iG/A1SPe4eiK45AMspDMa1VmvkCrMmc1oddjkEb3+8yGCIxVdEb/FTlZW+ym2o/nivApjMuxx9bb3QDrT8LhIzaUqBpMviJmKj7P0GgIhMiCcGXgQJl3qIRsgokxbX1+f1uCua4k6JzhwGgCc5kJyAZ74NsBgVhiDmB0v76LwPqR4SiJs= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X7eln7wl+60uq7ra4YWLdyC/patUaWC4L6lt4HnhaDGf78Wt3qeuhPFipR3/naxLS2cdveNHDTigz4/wZIdTkSnxFEs0urjE0bZXHRi6yWgnkRajGYpBg+Ei+atjodIiFrXEW6b4xFNJaNIwUf4cOUxZ52Xzc+cyEKfgsE4CNEZ/axOekde8H337d3q8B25fEMtZPhPEe9hHZeTZ6BvCg55xqNDzabR39D5fx1WEpWHU9glvJFUReNxSiV9y+G/DKZ9x8mX1J9v/S9AcJ6KEfLFxy4cSeDqofBsl+F0nzsx1VZBPX5VuBC8q0dO1go/Sxas6IulOi/WA1D/yjX/0x7JvMkxUmDPRIBfzlxbQ7/empagCnMPcxfkt51/CQxvMwzepiaZPPkTwR6KZpcOBFC2HsQyK3+Vy6jaO7+U+ZSGPBAXUXO6Qx2WL2z5UB4nw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /0RQxusPMXaEPr7610/9RPSSWL3y0xbGW6qFwNrjY9je4jEZRvOOqTsyZLtNLwhKN35YICBazDYzmklYA7X7+HT7Gau3P8ewdOR9JeVMmJt0Eu3L73TjTxdx7kZXgymzs5QOxP7bYT1hkxmhP2G7Uw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fafd9a7-230c-4d79-dbd8-08d955cbbd19 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:39.0818 (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 08/10] avfilter/internal: Don't include libavcodec/(avcodec|internal).h 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: xDWGE0mPoeY2 The reasons for including them don't exist any longer: ff_tlog() has been moved to libavutil/internal.h and FF_QSCALE_TYPE_* has been moved to qp_table.h. Signed-off-by: Andreas Rheinhardt --- The following headers are now no longer provided by libavfilter/internal.h: libavcodec/avcodec.h libavcodec/codec.h libavutil/hwcontext.h libavcodec/codec_id.h libavcodec/codec_desc.h libavcodec/codec_par.h libavcodec/defs.h libavcodec/packet.h libavcodec/version.h libavcodec/internal.h libavutil/channel_layout.h libavutil/fifo.h libavcodec/bsf.h libavfilter/af_ashowinfo.c | 2 ++ libavfilter/dnn/dnn_backend_tf.c | 1 + libavfilter/internal.h | 2 -- libavfilter/vf_uspp.c | 1 + libavfilter/vf_vpp_qsv.c | 1 + libavfilter/vf_yadif_cuda.c | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index db8aa029c4..72d795f8ee 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -37,6 +37,8 @@ #include "libavutil/timestamp.h" #include "libavutil/samplefmt.h" +#include "libavcodec/defs.h" + #include "audio.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 6443c2fd1d..ac609ab9cb 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -31,6 +31,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/cpu.h" +#include "libavcodec/defs.h" #include "../internal.h" #include "dnn_backend_native_layer_pad.h" #include "dnn_backend_native_layer_maximum.h" diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 61a1279b2f..6a4c546b4b 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -32,8 +32,6 @@ #include "thread.h" #include "version.h" #include "video.h" -#include "libavcodec/avcodec.h" -#include "libavcodec/internal.h" typedef struct AVFilterCommand { double time; ///< time expressed in seconds diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index b70d48e515..7029963e29 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -32,6 +32,7 @@ #include "libavutil/mem_internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavcodec/avcodec.h" #include "internal.h" #include "qp_table.h" #include "avfilter.h" diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 11ee490935..9390c80dda 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "libavutil/eval.h" +#include "libavutil/hwcontext.h" #include "libavutil/pixdesc.h" #include "libavutil/mathematics.h" diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c index 5099f0a806..95267d6a1c 100644 --- a/libavfilter/vf_yadif_cuda.c +++ b/libavfilter/vf_yadif_cuda.c @@ -19,6 +19,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/hwcontext.h" #include "libavutil/hwcontext_cuda_internal.h" #include "libavutil/cuda_check.h" #include "internal.h" From patchwork Mon Aug 2 15:39:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1679895ioh; Mon, 2 Aug 2021 08:40:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFNXFcSbddbjsfy5T7TNBHF9+LEZryq0/eMvCE8vfa+wt4hJ6WLR5C3+REfSCf1olT9RZN X-Received: by 2002:a05:6402:5:: with SMTP id d5mr19868827edu.359.1627918842230; Mon, 02 Aug 2021 08:40:42 -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 k13si10860030ejp.411.2021.08.02.08.40.41; Mon, 02 Aug 2021 08:40:42 -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="X/KjC7+w"; 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 83864689F02; Mon, 2 Aug 2021 18:39:49 +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 BA5CE6899DA for ; Mon, 2 Aug 2021 18:39:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LyYE5s90w1+ncs/NLvaaCVW1zxCJqMZkav/2HecV+pDDmNBaG4uR3mTiwxh4CLI3qys5z8JtwMVYc5KkHmkLGqZNoGA4+sBx9MEMPk+LcW1hAwfXse4btnuXa/klThGdrSO5iA++9ODz0X89qJEM9rjxjCzOszEN/e+DF9ilN7i22z/MH88vAoDkW8jFKfhFoa71GXq6pEoGfW6bAG4egJywkXGDIqfRy+wnQ4KHoYqM5f5Gy7Qj4Ueb6mheoCQgTxPdkUl8ElgRCF2fDfgCAXL6EHir7eCWFQYiQwY2DLtUT92FBO+PrEf+pItYwlerW+KHisX/BdkYsKBHAhtA+Q== 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=v4csnJ8riMxOSA9nsq8jrhutE5MXrPsHA4vS+uMfBSY=; b=LRKJ3AVWDCQNo/HGgeG5kDJMJytqNgKlh5yo1oDfEE5jih9oxiIEu1p+3VYTBMMuRvsDS17a8Kg/hxmz9QSrndFNhbJz8i4ZzoPYiUT36FOU+HRYXuFsi10pyOAlrd3xCBS9o6SM5c4TuPyNpcVYdK1fo4oBNVYIrysqTuLA6kl/OuWPsGW+aPf6h0JbkzYNncMZkY3EiXlr+H58nR5L8yDVNULrbB98BK2GBMswWbCd0a0E1WNuDJ5xsCBg7VDwv3+d3wzU+5I6q5Nb1Lxs69Sjb3g6FLtGdIcYsfeEPXLXZLQg5VZzaaz4WElvGPN6/zUBaloRz7rvYkdFyJKCkA== 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=v4csnJ8riMxOSA9nsq8jrhutE5MXrPsHA4vS+uMfBSY=; b=X/KjC7+w4LNpN6n1TKItXYhhPR5RRFFOo3FwFt7qGAcK8ax8n03oexeXt4lg9jT+HFKE628n8Z+dkEMIZmeLhARo/2YRGEolXD0La1pZjxGJeh5iau1pkI00wDPveZtKmcIJ4vbUtdVOhXS3GKIdYCgt3b2WTA/UJGFGe5D0PKIIIaJsJzX6nJoaIQjM7JHSbYHpD4iKrNo4xfIBtbtESBV4yApehYbn73q32cl7bc0N3L2Q89P2m1l4cSQhuPKgxFxM3INsbN9zaZJnuGbo9XKytD3Z3sA3aa5OXL23+cj0GoZS07vyrY/fZHOOS9pGTDGMo1/SGGOw/1+ntehQGw== 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:40 +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:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:14 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [w1fRslxtLB4ii0HmkjCo1f3wFJXnALEV] 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-8-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:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4089273e-d0e6-4d7d-22cb-08d955cbbdae X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT7FzPiew9v5CevtIP+WXD7izs65ojSTDVkHRfmJmTSUsaKmd0fOwIvUWMmPY/llE6gA6PQZT265jgXniGVDECKecQFFTsFfLkXRtjW1fvlPS246cQTfBQMWYwhYh1D6EA3TlblL4PkiccF/sX+avmCA5K4R3+bF6f7mNq9lFOKH8UGcjpRv4+sM2fiMtuVDHWgd3jCILsA9giIFqvX+lsmn/RMz97TKdzzQkbQqLVKqhlAXo45s9RYqJz0qKT4yP2un/jXVr7pz92dHMo2x0WWWsP3IWNXNMN1sGOT4sAYdoxy+S7fzd2gfGvck3Zh6Gb8pAkGlsSZu/Kgnd2QThrH2BQ+BYhcPa25BfzzDpzLrgb6FYUKCpn+r3dXxwkXVPILIuN/SMh1yR2s1yXsKIh56DYRX//YkU4RvMAhdZyRIkg8hU7RdKU52j05fjrVo7PnjTaAvLC2SHM+Tddmq0rcHgJ4g2Tu4NWsEpsKaH3FvsCU8QeyokWlXAddAX5LXHn4j0givKs2KNG1Gwe0U2c0LXm0doFSe2iMgcni2uV3OJFk7GwE7CQtwdOCa3+n14TOkz8bT8FT8hm7DnE/VJfB2hWWx4wl/YRT386z7bMJJntaKiDoum9Ph/cm3J452kn+bLffv5R/YWRkgs/wQGg5tW0PVzBKGqVlGe9HTTnMzGsdUQqSvNjcrsUZ/g40Yqev6ncwotnElIQV810lHXGPrd1XxZbPcOaACpun/3Z14VI5+GUPzdeIo5m4k5aosIA= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qxYkpfs6eUZp5n3a/p0Ocsjj/jXSMZs9m6SOI33Wg50bvIPZwqRH/yDk/hqKXOXmTmt0HC308BLDNfKLmpblyAncYwrF6zfJveRfaSCmwQhJ738LveC38ExAgze2gqqoQ6sO2E1CSnUbj3tQnD3Cxpq5WtT10ubZYJgIMXdbS8lNrmotcbuKQzKxqil4bwWLk1G1AI22siTbXgftEBA2bPtb55WOejTWcmc3Tz9YN4kHCAO31RPOVWvY/cv5fpGb8mhMnuIbUEBv3HNizpcmtWm5xCwjPUdXpIcnD/oQyR7NCONgGWR27ImGXioSs0oIQjU9SOqRa57aVyj++MstUQ7l7DA8QLYnGDpbPwGuOsOCmL0isHaJ5/ezA7GTHkpWqeQacadPhdk6XbbdMX1OUkPj1YkRKNjZUXODt6sp1PJanY9axJFQ8NXzmhomIqXW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HAkJx3fQaV0fon197RkFQC/aMv8Dh3TuFMY13wBgOgQakpbcUJXdrwkibvq/OL6u7+lRQ6Unrb1vH2vTkdCnMSX0vBSjAErbkBlzWTx7wCDM2H07aKbocGW2FQatxrgUULanuinEejNFweif9kKKWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4089273e-d0e6-4d7d-22cb-08d955cbbdae 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:40.0446 (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 09/10] avfilter/internal: Don't include framepool.h, thread.h 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: WOOsitXfb46K They are not used by the header at all and only used by very few files; so include the headers in their users instead of in internal.h. Signed-off-by: Andreas Rheinhardt --- libavfilter/audio.c | 1 + libavfilter/avfilter.c | 1 + libavfilter/internal.h | 2 -- libavfilter/video.c | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavfilter/audio.c b/libavfilter/audio.c index 5996f607b2..0deed5683b 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -25,6 +25,7 @@ #include "audio.h" #include "avfilter.h" +#include "framepool.h" #include "internal.h" #define BUFFER_ALIGN 0 diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c04afc6639..16581ecc09 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -41,6 +41,7 @@ #include "avfilter.h" #include "filters.h" #include "formats.h" +#include "framepool.h" #include "internal.h" #include "libavutil/ffversion.h" diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 6a4c546b4b..6c908690b4 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -27,9 +27,7 @@ #include "libavutil/internal.h" #include "avfilter.h" #include "formats.h" -#include "framepool.h" #include "framequeue.h" -#include "thread.h" #include "version.h" #include "video.h" diff --git a/libavfilter/video.c b/libavfilter/video.c index 0771268c40..810cc87f52 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -28,6 +28,7 @@ #include "libavutil/imgutils.h" #include "avfilter.h" +#include "framepool.h" #include "internal.h" #include "video.h" From patchwork Mon Aug 2 15:39:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29197 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1680029ioh; Mon, 2 Aug 2021 08:40:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmO4JON9GjVSkgDcv/PcXZWFdiZZk+kD7yXjwF3cCTa9E9BwT/F83CIqjZ7QWRTAEuj1sL X-Received: by 2002:a17:906:7b53:: with SMTP id n19mr16025241ejo.14.1627918852677; Mon, 02 Aug 2021 08:40:52 -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 f16si10585829edf.596.2021.08.02.08.40.52; Mon, 02 Aug 2021 08:40:52 -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=FL41frIC; 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 6EB43689FB5; Mon, 2 Aug 2021 18:39:50 +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 D5A7B680836 for ; Mon, 2 Aug 2021 18:39:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KmcLq73H9iMogb6W3Nf8KUnYAmPP6fbcZ7cdDf+gX6lr2klzGtvrZ6FeYBnVj0Nz3fxier5RgS302hM9ImM9t9FP5tjZBS8XDgObuvFI2GoMXEHB4NT4PSz5cR8cSrHocz5ot1Rp6uwfSNVN110zrzQBAT+yEdsHpHoCkDUeBKoRzWNWz6wCyHFvXQkrJ3usxACj6to2P52y7eEaVnrimg0pqz4T7Q6x/mwHSdo6HXH5vh/OW0LB3AGzuWw464lUwCoX9G2gcdHcl1BZcxF1AdJVdAqePgtza33LGZiqbs4nTzO40ooGnWuobeQO0why67lkiBaQ/cPUz7dm2EWJAw== 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=Z8k3//n06ap7vkj/2xics7WP1RBFHcDa/1Wphubkmps=; b=DxRghCmNYZnwYYAVHFbgWtAHsDsZPCyzFN3duwC4n+23VhCiXdMBmFG5/fS50FKjTpk/r43Db+unb8P67iwHb231Uvp408qBmUhFkAU9yrvxTULhcuXBUw19ut7PhhFWeJlS+VM/N4vbzRgK0B9SOm32dva/DxECFAuWf3MCQDsoG/gWWmos0N1lTJaTmasNGcE7HzWJOqqC2j/sJ5Y7Fo51/4E/xdVSrboIz9mHOOdx0tR2qKUJbr+0E0oO/4JRvY9NZKj5/nMJLQfeF0FD3zsG6AOQ2lOQxirvfISpLW0UTL0MNZfbDq6vzFJYHSPQDEkew1TEglPfUiyPBINJKQ== 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=Z8k3//n06ap7vkj/2xics7WP1RBFHcDa/1Wphubkmps=; b=FL41frICQEeoUKi1A5NvZAxd8NENSaXzBep0qp25fMUGG5I8o8xORFJxEyRXtiwMMgK2Up87N/FIq9+UlBNQtMWesqL7NTCcoxBUMfDBl7BiXcXWgqFZg4Ca4R8jP9+AADO6Eswdj4lxiWhDpv/xGVbQMdmdlJqfm1Id1vlXorwkX8rWA7RgoGXDrJfxMu5aBvKDbJ2hG61zbxl+EHFc2SxVvrEVfG8xwnQJDqBhjFrYKxuojUPXJbXuDQylTIBQgWZL34a815a1dHOBoVu4F4SPK66xiz1fIr/CLz8kF+FZtepKw/enarzIc2M/R+FMeFoHtKs+wxTP3Pjyz2rDYg== 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:41 +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:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:15 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [iGgmzCNzEyC1SiPI7HBYSalX8wBV4P0e] 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-9-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:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d902259-0065-4017-454c-08d955cbbe2f X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUytrrqT4o9623wQ4EiyPTqiGWsZxF2eUxn+ucQYx580A8S8V/uj1QUJStVFWtIk8CKuyvRTERUMY5MjE7e65L5Hm20pC3btGt89bYY4H5o4WZrRzLye24swIKhv3sTOwbF+N61+qgrmxUqv3ZWsydZYbJoZmNMjgyZ73hTQUNVlStz/UAiMf9EHc3lQ4bHzkQs+F9MIoKPR0moVpUxkpYsgs5p7YSQ/Ltz60CcM6mSdPJnME6wLsYWfrpQIfUsNtd6HcDk0pPSYeHOnGncVzXDt3aAcxTcznulm60xwWoOaYtSEyAhz1KC/NE/bl+VAJ8h9+cLzuX2LmB4QTAKCCUcA87BBMXkaYD0803ps1xeDPgDePBp5SyyVjqp3MF3WI3ysMpskjwDTygG02NkTtgfGRv1ZtVVy9QE/qirVb6Y7NUkXH3bTwCnZF/ZZlCEqcoy2XlyT8oFpi9DtCAUtk8veOOwgsqqEnm4JWyBe511SHtTtvoIjjeMthCG2syH/iEIre7jm/Pgxwh3nCamkN36IqL25e3Tp/dAir54Z6Bo9KgWUOS0I1dkEMR6jxWCeUd7vlUlZ71iQ5hii5p0Wh/YNc+HlCGtXZuieynaBKVItaX+mmFhEch4748Y9LqA2ON7ohXsO6iVqlqMNuZUo6vwTWLoAto/bnD4slSs5TGN3rmanO6s5n7Z6Y8whPonJZ1Z73uskqA1PysErv4dKDNhxh0nYDaYTNc= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c/8LFEp8l1thDxPK+nDE8/9nZX550RvK5ChCbw96t2kjJWwzuO85AbarCNESiQibNaOKh/yFM2oWCUOWm36lsYRbgQ14mj/0LOyh1qH5piKwgBbfdN8h8gM2ueeXFI6EXz3D0iFvIy8da9iPm68qCWRPbe8ZoZV3F7b2XqaRYmhN4PC9EiUtmnKeVukH3HJ68w9b+QuZ8Tf8gWQXFoVS7Y6obU7yh64Zrpqk1iA3ykpnWuXZZ9d8o7+UoIYZYW09osUskXFMrnNVdH4KyVtI0zUOv91cV3B7rygLNFZVRAnho6/7l478WF+suc97qg/MgEdzvFjXKl1x8R45sJPsR+7+GxJ1B29MTfWOBpQlcmrFaacQHzYRCOo080dUh13cHb5//qcP+zYXLisny/texEo/azCySInhtbiKiDBmcvFfINPNMnsSQK/KqGSYyjyi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8AWBd/+EijUJWmfISP29fblWm8mU1jxnQsedUZD1pxgmagHJTKYW2d6CMSJ8sw5I7qiR+oiEpA53SwWvuQwR4uxlu04F55M4aW271vfNnEXRYH1w9+9vbrD2WhCiT57bzd5f+0iXZXup6xpG4/de1Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d902259-0065-4017-454c-08d955cbbe2f 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:40.9317 (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 10/10] avutil/internal: Move MAKE_ACCESSORS to its only user 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: KlRCNgscG+sj Signed-off-by: Andreas Rheinhardt --- libavcodec/vdpau.c | 3 +++ libavutil/internal.h | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index f20dbd78e2..7c29746adb 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -69,6 +69,9 @@ AVVDPAUContext *av_alloc_vdpaucontext(void) return av_vdpau_alloc_context(); } +#define MAKE_ACCESSORS(str, name, type, field) \ + type av_##name##_get_##field(const str *s) { return s->field; } \ + void av_##name##_set_##field(str *s, type v) { s->field = v; } MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2) int av_vdpau_get_surface_parameters(AVCodecContext *avctx, diff --git a/libavutil/internal.h b/libavutil/internal.h index d8a1f2672e..73498dc70d 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -86,10 +86,6 @@ #define FF_MEMORY_POISON 0x2a -#define MAKE_ACCESSORS(str, name, type, field) \ - type av_##name##_get_##field(const str *s) { return s->field; } \ - void av_##name##_set_##field(str *s, type v) { s->field = v; } - /* Check if the hard coded offset of a struct member still matches reality. * Induce a compilation failure if not. */