From patchwork Tue May 3 06:37:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp257861pzb; Mon, 2 May 2022 23:40:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwac7Wu7PjGDFd3FmhFeK9FYqrDuJZUeGzqIkGchzqFZBJr6YvK4qEPgl6geoJNmJ2Zpld8 X-Received: by 2002:a17:906:4313:b0:6b8:b3e5:a46 with SMTP id j19-20020a170906431300b006b8b3e50a46mr14207827ejm.417.1651560028770; Mon, 02 May 2022 23:40:28 -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 g3-20020a1709064e4300b006f0034e2730si13133579ejw.930.2022.05.02.23.40.28; Mon, 02 May 2022 23:40:28 -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=bSO6DTZD; 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 2FE2468B3E7; Tue, 3 May 2022 09: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-oln040092075040.outbound.protection.outlook.com [40.92.75.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BDCD68B3C8 for ; Tue, 3 May 2022 09:39:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g6W09nwnryFXzutqWFzntChAjwo31x0sYQkLY088mUma7/res1WS6QRHMhrrFPrJqXFL//EF93a6CJhTXQdMj5kQWSrZQMukdaV/tyLJ6XJsk6FYe4sVhP2VqbZFu1rs/T1GszNr9EDkr+Qx2RSVDRLGPWaUTz0BPjhcWr9u9RGjefYOfAxAtWFyx03ISAQk+zPvqBfXrJPrGpw1ZeZKFc1OJ1Xumr2hth6vzxKLmKo5DAj59n0XePo6BIVvIoK7aRkFshR0dS+4A1HXWXJKpiKQBKqLRmQ6juBTp48VqjTJlUkhEHZLOVU9ymKy7lTcZc3i+qO9XrREhPx9i992xw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vz+1GyF7XsaO55H7fxMt7oTXlpT9JubOe2/DW3APK1U=; b=Ohs2X2thVNyxUFWBMwLoNV+Cc048tTVr/NqwndhWMYludrnw6ekOCc1UzM8JldL/MZm//eXs1hc921yWEA0PoplnYIj3L+f+xBqK5xiOTYy1QBM+Jx5B0qIZ0CnH+6pvYdqfo0PHLHLoVZ7bJ4Qm1isx9D7Ghix1wfn3xbQ1MQzOSYP9sKcg9jUmY4PFHnqKXx79ZXVY0z7aKiShOurKR266iOmxqwctnnYNDgYrHqJ6fOP+mdZT+it0MH4VxEWcGmiTHZEKob7rOChaq41apEClmFzf2lO6Si72fyxNMQoCGsnenDLf92oYV8UXhQGR8+uHaIWiYP8rXzO0AvU9og== 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=Vz+1GyF7XsaO55H7fxMt7oTXlpT9JubOe2/DW3APK1U=; b=bSO6DTZDGaOFEk2vHlmptivvpHdacs+xfdy1RMIe71M9Yt50t4H3R5DUXkVOI7/7sNfuD1QKp7xX7gb+80AGMh6MM5KfXxf07MwHCiDVRxF/1VeQ12I4lL01Ya7Ao9OMVUz43KN98K7w6OMchwauQokLqzNqk4pLwHDm2hXt8+e9/ssu2ABtuQFEn2WIsmwyS7CyGyQ5WE/yvnze0oeiTqi/ny2GiETDsNdSSK5cMQwvbQq/YCNKqJxe1neis8E235PgWjHXKUB85GMrD9x4xd6XSX2AafaiT8kil9CYqRSpyJDmMkzOm8L2JN3T7i56KZGpPoISbLtlHzFmLRhpGg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR0102MB3230.eurprd01.prod.exchangelabs.com (2603:10a6:803:8::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Tue, 3 May 2022 06:39:44 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Tue, 3 May 2022 06:39:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 May 2022 08:37:51 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [1tc7y5BzuaE65OmpcXh+9mtJHkCtBKCe] X-ClientProxiedBy: ZR0P278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::24) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220503063751.2261222-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76454df9-5ece-4b61-d80a-08da2ccfb489 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTQEkMEhbgfP1CXQyS+IofoA8939WrUHOZbU2KC5WHQ2d/+5+VzbFdrWIuCl+kJkczOtroKFWYmo/D6nUkG62f7cbeSlO+4JTarnu+cu6e45eOG7cGKGP+yhxCAGSdoX3P9Qz80y7EgWVx7tqlEAIVDS7Bc12IgyPk39JDrx/gaJ4c4ghXasC+jKUTfdmE5BUhbqA2F75NSjtxAy0gzvx055ZDT3wZ+6wc1l0rXmYCMTCpFzMP2SLtmqo3zhlNoKs1/JDkmqlqekOyR3pnvFv1+lSc9o1s0rw3W7dF69BurFIeATFn9SoQw8pT8JQ+hwI7Ift4dxqSIeeh+GQ1v8Xj8rTtwmwJDN+1HC/15Ezjed0eq3ekPPmSxDeAgL2445t31WU3+M/pP0SibHvB4NFFXow5f5C735OyBW1KyJ+cSZVwrKLPWd1qEBKmvs5TqyYn4ZwEJTuyNsq4D+pkNzW5q1iqeujuewxWXJhrHAJk2hW/AAR9v5h9/CW1XNKFiogtdM1wTv+sh38VGLDhvCJzfdNo45BePxoCGyNvuynnYC/yDI279VevN8NF9D3AY0Hky3rPNwoLwtfjMIxvIAK4+0Txz9r686I29WgmUc17afgI7agOmLFfkYIfjaQ7/xlRo5jsxTaEgDspxtuGVtNQ9cIo2LFmyp75bkxRCVhAFlEnuXaaTWalxAzD9cX8fmIklIUE8kZIez/EWglsiFIMaLC4tw0TwAVXN7aQjP4KZtfYp2x2IJdi2htcgLFKEuvg= X-MS-TrafficTypeDiagnostic: VI1PR0102MB3230:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yRNZTajBIAs+BNS3T2GcbNaQsZ7XaEG0IwkK+/2Y0tYQdn9mK4Icxdpwc3sjAInzvBLz8wNQWVx2PzuDY7JB5Y6ZLG32bggyCpY5zNV7znZuH1MUqp7VBFDCi+Z91Pwg1ZTGUmSPp1S4HKW1gFOkE7TdSmquqYPVlHxgut9KsP7r/apfsGCqOOgvS7qqKFBqBJM5rcI0EBTow/kV31QkV+c2Vt+8jqKy4QzkaEmq09ksjifF2rYePX8HvhgDsKcgD1qpICPxSZtzFLXRigaez6l2lJvnEohmRenlIRlvSLBD+CAVty0JU9XO5LnWm6YE57oWNj7L+Yd23pmyGGSJ/DRc53xhtxhK+7U1RUMS1Tnpve24IQosTzQzPaitzbhhfA7f1WuI6pEGmwGB6FsV5Hta2pyDwLiudr1xq/6pvp34rx8S2LZhvrRCOkE6fl6wQZF1jWp2Gf+XOfGKMRftBxq8vQxKn6IuHSA97CNuUXxj45gSP+Aa+C6suJVS8Cj+OJEPN/N/7ANnJ38jswTUAvqSrqu0fohdyjvQ+EMGcM6gqnXWnrZMHNzmLHL2et/3KqZB2SSb14e8dwCQYDFqew== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4yZAI5X3DffdoXPmCIbRoF6CCaEXq7SZoY3h75sW0HJgg65N+WDVhH+WnDTtwCrcLZG+T3IsqLI5F9kME3bHSou0WEqUEEawcR8NyGYguigTwFjOCcAQOZPlrNGiX4Z56O4aRPfIGAU6n3aLN6YaljLm674oLiBszr/NRqPD7sbWkafw/hnKrHT7lvTxEhHqoyw2sp7Ekkx5FwXNMtRUBHKUBzybtw47pthxaQV+UHvQbYNutOrqwk9iWcuL2Wy5EtTVrel951mT2+PG6XBh16s7AVjLhnQwcLDTDz95h0xgjyOIOIMLPIGAfu/snlzzT4TgVOHeudZ0PNgpdFhB8thXqXAfKCLCI4ksxB+LK3cEeLOkAStnw6q/iVlR4H/f70tvyPR1YIU8o9KwZ56LFVqEIoG2Cy7+7Je9pVkc/3o13dYOfOgjNkiTzgqyXcPqAkrGdzQdNNLFRfzDNAK1zRzkKJzbjL/8kTr9/6uPaN9rxpPBabfRxQdRm88n2BRs9/IiN8Hg0ZnI/lEP9FDHwUgPhK8Bp0erJDnxFoaRCe7Fq43S63SAUdHPh+iDw3OktnLpUtXekpaH+25+pH2P4G+Jv1qSKMV9JXpYAqRkI4ZND0Pvqys7pSDExt1zT/A6kxYwzj2xvXe6LrJ6XSZATtlTf1JPCbkzB1Suwl1VBaid1Cu5Uzi9xb7gDDA2JJNCutVCiBL357TBw5w7Qa7nChSCUyMLUv50HKVy3HwgclUeKYoAhiTCc28GEEz90ATQV5PlFF54lfj/fnGc1q4TXMGILprKU7APrthAP8Scw+oP+Rb0WOEnwtJDp2kRr30ft60CZZzkvGMoJhm5sF3DLHv6lu3VFRRLaRG3+oHrMu1oKASYd587H8RcoLl5fGevjVr1YOyQsgbg7Q+OLt5XyM3kVyLlw+8G7SHxlHx/HDsZ6oKkQoW7OmhkMnwo++whtSsbeZFwvdviIb5lzE28Fa44TRjJQX56ye3K5ns3pMIMMHAGTquOyA1GxkPO4TWpStZ6FL/TmawvUux1MZQNT0rrTqdCeEOKhUQo3GhHKGPWWiL8E4BSl5KEWes+BHw8y70Ohl3yuHVPuPdJ0dSQ5Wl46rzgGwix77PXMMg0bVk043VuUXR6NkXARNSYFzGJFUsYtaq8mSJcsxJlkK+rfQ4+k4lNY4CuG2JEyJ5w/IF3D6RSvbPuP5YnF87/aVtprZgy72CqCQTb5a2421CGaF5tTTgW0r6UDZamMYIBMtdIMqzwd4RI/F66uBbaQHCuHSkhVpnZ0pJ+ya8gcg5WIyMMntTFMWf5vbnwYj2NtpJvjZgEqmnNdhrwUp+8XCr8kS18h8qOx8QDCA/wkwSCDrZnYs8h8elurCHnjkXdAzUm6mA0oT7Lz7in+M6TkveDzQ/k3ZH67zCCoyzUAlbjPMXGtSePXwzDrClJs/YpdNQL5t/W/kBeOjRUGRDwoQXzA74KNiPl+Y9gyiP+fYrH+Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76454df9-5ece-4b61-d80a-08da2ccfb489 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 06:39:44.2328 (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: VI1PR0102MB3230 Subject: [FFmpeg-devel] [PATCH 10/10] avcodec/v210_enc: Move ff_v210enc_init into a 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: StbNCCrP9Jtf This removes a dependency of checkasm on lavc/v210_enc.o and also allows to inline ff_v210enc_init() irrespectively of interposing. This dependency pulled basically all of libavcodec into checkasm, in particular all codecs. This also makes checkasm work when using shared Windows builds: On Windows, it needs to be known to the compiler whether a data symbol is external to the library/executable or not; hence the need for av_export_avutil. checkasm needs access to the internals of the libraries it tests and is therefore linked statically to all the libraries. This means that the users of avpriv_cga_font and avpriv_vga16_font in libavcodec (namely ansi.o, bintext.o, tmv.o) end up in the same executable as the symbols, although they have been compiled as if these symbols were external, leading to linker errors. With this commit said files are discarded by the linker, bypassing this problem. Signed-off-by: Andreas Rheinhardt --- libavcodec/v210_template.c | 10 ----- libavcodec/v210enc.c | 48 +------------------- libavcodec/v210enc.h | 2 - libavcodec/v210enc_init.h | 90 ++++++++++++++++++++++++++++++++++++++ tests/checkasm/v210enc.c | 2 +- 5 files changed, 92 insertions(+), 60 deletions(-) create mode 100644 libavcodec/v210enc_init.h diff --git a/libavcodec/v210_template.c b/libavcodec/v210_template.c index 9e1d9f9cd3..9f40bfe97c 100644 --- a/libavcodec/v210_template.c +++ b/libavcodec/v210_template.c @@ -22,16 +22,6 @@ #include "bytestream.h" #include "internal.h" -#define CLIP(v, depth) av_clip(v, 1<<(depth-8), ((1<pack_line_8 = v210_planar_pack_8_c; - s->pack_line_10 = v210_planar_pack_10_c; - s->sample_factor_8 = 2; - s->sample_factor_10 = 1; - - if (ARCH_X86) - ff_v210enc_init_x86(s); -} - static av_cold int encode_init(AVCodecContext *avctx) { V210EncContext *s = avctx->priv_data; diff --git a/libavcodec/v210enc.h b/libavcodec/v210enc.h index 51305c1a20..b74fd33db5 100644 --- a/libavcodec/v210enc.h +++ b/libavcodec/v210enc.h @@ -32,8 +32,6 @@ typedef struct V210EncContext { int sample_factor_10; } V210EncContext; -void ff_v210enc_init(V210EncContext *s); - void ff_v210enc_init_x86(V210EncContext *s); #endif /* AVCODEC_V210ENC_H */ diff --git a/libavcodec/v210enc_init.h b/libavcodec/v210enc_init.h new file mode 100644 index 0000000000..6d81cac319 --- /dev/null +++ b/libavcodec/v210enc_init.h @@ -0,0 +1,90 @@ +/* + * V210 encoder DSP init + * + * Copyright (C) 2009 Michael Niedermayer + * Copyright (c) 2009 Baptiste Coudurier + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_V210ENC_INIT_H +#define AVCODEC_V210ENC_INIT_H + +#include +#include + +#include "config.h" +#include "libavutil/attributes.h" +#include "libavutil/common.h" +#include "libavutil/intreadwrite.h" +#include "v210enc.h" + +#define CLIP(v, depth) av_clip(v, 1<<(depth-8), ((1<pack_line_8 = v210_planar_pack_8_c; + s->pack_line_10 = v210_planar_pack_10_c; + s->sample_factor_8 = 2; + s->sample_factor_10 = 1; + + if (ARCH_X86) + ff_v210enc_init_x86(s); +} + +#endif /* AVCODEC_V210ENC_INIT_H */ diff --git a/tests/checkasm/v210enc.c b/tests/checkasm/v210enc.c index c3d5cc5145..9942e08137 100644 --- a/tests/checkasm/v210enc.c +++ b/tests/checkasm/v210enc.c @@ -20,7 +20,7 @@ #include #include "checkasm.h" -#include "libavcodec/v210enc.h" +#include "libavcodec/v210enc_init.h" #include "libavutil/common.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h"