From patchwork Thu Jun 9 23:54:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36109 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp654297pzj; Thu, 9 Jun 2022 16:56:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGvYpsZhb9n94/0Y8Kt9F4onCmb5Y7APaQVpM0CHvdlF2Cg29oyva6Nu7Ly1+TEPGeBAQR X-Received: by 2002:a17:907:1b24:b0:6ff:235c:2ffd with SMTP id mp36-20020a1709071b2400b006ff235c2ffdmr40312040ejc.116.1654818992873; Thu, 09 Jun 2022 16:56:32 -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 i7-20020a50fc07000000b00431fd4040basi5173234edr.105.2022.06.09.16.56.30; Thu, 09 Jun 2022 16:56:32 -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="Ofri/S5A"; 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 1E10668B85A; Fri, 10 Jun 2022 02:56:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070085.outbound.protection.outlook.com [40.92.70.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0872168B83E for ; Fri, 10 Jun 2022 02:56:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PdCMyqTjaPaAynHQggT7h73paF3O3zcxAkLBOXoSKmoSud7nJwdEDG30wiSOKn2OISMbJ6O9x3Ia+J2O8ws/mbl2/jZs2kfhQ7ufMxynuWSTqmYPde5KaZxbD/Gb1waWyL8VUg2/dPVc+vwseq2qTUvZG7Se/sTjW9/dnnO0ifdSBjlRMLLLFIFu1L38JL2WcmBSsYKXQgklae7Ed0W1eHkrzKQCtwWzqu6NUTFVXrapYNGyQcmtJpvE5qX56XMDO3c1Uo98If/jJ2coEzzMjI1ABUlsK7NusSoCjw2Hpv0aVGg4Np0htC8ciOCM/jXZEPfC+fgVE2+6UQkDbqzLnQ== 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=GiHZn7eMPdUpPv1ubNBJ0YoJzKWPIHLiN9PB8rF+4HU=; b=RQoteCLsSpLx7OpT4ejX9H2l1nROkY/iHWhmnw9NBky3Jij2gYm/DJYD7f8YCNK1Ibp8DPBWturqnO8AYYUlh7an/5+yPT8TnZoj17jCyWbvS6AyBErpLRaUWTFfysgPXAR4SbDetiE3yBRYwy2j26ciypu9oDXck+Gb9WDp5WF8i64B7Pt27a+RZ1wBW5uBh+xzAlcvf4UxkNI0a46CRYrECIQzrncZ2qiHguPVuOc6D0XUwoE9e5QcrlhF7kGq0nynKWGRkjkj26ZncsOJk5mix0+CBS1ZAAMjK9N+jnRS8RlEAuDGmok4xyNenujZZzZ6OGXnGTRBl34ybtsfKg== 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=GiHZn7eMPdUpPv1ubNBJ0YoJzKWPIHLiN9PB8rF+4HU=; b=Ofri/S5AwkVetDUpHJOp9gYnnKde65pIaDsM14UbmXCNL4WmeIQr39nHKnNOdUnJWUhc9OO9rSH8b0tI1uAf0kizs/SgWsgk9Wfgvyq4bVrMwwIvcaXDKy0dxy5J361T92trcHFFCNNiwhT2r9ywtqYtbJd0rBRBsQxW7PUSW8ynpR1r27JGof+L52dqEw0+3Afaz8AlCT9cdNEHCO+0asRO0GHsSxLDt+DOD7HieBGRN/uEzyYNvfgtecuPgKZCHsMl5nF3OZUDmFniaZzR15HnKAl13IKDjMJoP8wmWQVlqsRkTQFLwPjkivMSo29T1I7tQ4k8IfLd4lgSKMHNOQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB5809.eurprd01.prod.exchangelabs.com (2603:10a6:208:16f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.12; Thu, 9 Jun 2022 23:55:58 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5332.013; Thu, 9 Jun 2022 23:55:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:54:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [hyAnyqFOuxsVlvWov3GDQ+bDFCQV14Kc] X-ClientProxiedBy: AM5PR04CA0005.eurprd04.prod.outlook.com (2603:10a6:206:1::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220609235523.458689-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79a1c578-3822-4a23-99a2-08da4a739976 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWLGUKWLgTOP6UEsm5IqqCXNdMnbfdyWJqEuNqkKW4n9rns03a/lB3jciYGAoeHQfbIA/Xg8ELYTp9O4YynvUeYOMjGs4e090LMv7iZ/jzFB59KA/EQX4iQaYvENZOVjL5+8MHgY8+Kh3O/9wki7vVYPCZYJjZZ1fREYq615XBdleFXGm/JEACrvNaNPuQDldeWTTLK7miDCt7xZ3XY29r6RWYcSqUdbf6LgJzBuekO1ZmpUc92/JZp8CQFacUzxmnGHZKuHoHSQMc1YVKkPkNm+X/oYBTr5Q00KZ14REbHKZSJKZ/YuvFE9Qg0jjBbnF2GTSj5aUiUi3AilhT1JQHuPmn1iJCgv1KQRdixCST6Vk1/dmwdxUMKtwv2OTQby/lHG4MyEaBZO9HCo28bd3SdU4+ClUQymtHuO8dm5OZ7knsRab5jHBg5stFX2jVRCQTcCAPbnrEHIKs3vl7LsEA1XHz/kIYPcdizzDF9UP9F34Aie1VKf1nAQf2rh+jIvcabpXFkVy4pwLBPCPTSldsOYeAp8pGz6kedyCKpznKtxHG2RKAF9d44USR4G7ER+RwfQrk81zLTx6sKlKVUF0B8PQ6yONxMX9qbn/6D3yMrEHMH3hyFKTCOSue13FYs4BgOzcCxbUTAmWXEtBL68hjhEBeMegwXFNFziFIi5EaKQxWVnZPkPqZZx73Ebc1poyLIrFYRmTNUt9cwL8h2jL/asE2+H76hXr4= X-MS-TrafficTypeDiagnostic: AM0PR01MB5809:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gWEzagduEogpS7NDHVqF+ZhNdNkOkxNNABPlCBHa5iSDeIoPwbtxjJEVGIEazqzUpvD4C8CFq4XkLGHqo8+eYARTYOcS+Xh+7SecAQgMG+G5HOe4CDjQdABNH2brTL1LKJ5DtOCTSbleKeXTpIriOyMoJR9l0ec3kkJ537ZT7tsTr2piP5AjWf8CMCETzFg1Ks5uM77RZ/j1ntPsMa5nrL9XZLaOwUhOQ8uTZAe+/G7cX0rK57x8q/u4VyKUT/svgX7uxJjMD5Km9khtR7ks/8gln7v+3Fog/uuXOM+IYOfaPrFq8GapEFSUUeuCFAvw9D1Jc1tKvdYG4SUkNGxtJN3a6PCtkVra/Z840cStoZTJ3cwGU9SKXwJVRrZ3ujvgveBU7dX/KTaghQcvha/x0Du3EN8YmATnHMCK7mrQeLUJN016Rd+dCQFtsKkkNWHmHgvI3Je+unfDgT/v9srA9AaL82usjPnpwWxKExUrj9yGy9M73TRluWyioR2ASfvki7c2//xJere1HWkK/T/PlThl3ej4UqksIslcyy4VDu8cuEcpMTkCFpZeVAIoDfiLZM6XZDrWFQqv5EDMHNlkww== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K7LNGwROkBU4zWGQ4zLOQ3Kdyfdt7+ICfDU+g8ktdtXEsGQrmSnuXz0cUW7L4rAmG7yPIAczvGNZq8SgllUWgr31ONZOLLySo0ZrgzEzUfstzE4H4iDiLLiI49/2Y1IAzA1SRSWGPBldImji+XS4Y6EVEV+IHW5GkRPGw9Td6QvD7bnFN6ph7OObwTjDECbdAsvNv+0oN7lZLA+opNFKAMx9/P2lALj8wlAs4yRlAE9kBqeJPKh42eDKD+b7bEKyh8axh4FDFnhiWvsCTpKUTL1lKG90tBcRNWJmVUwPHgjWQIJfBjlfcvkJmUrqKNlNHoGccZuWxu0tl6hWFbSJ38Pcr+alIsgsi1vput4WWp0/5306faAHgwXtdYpy2nWPUkMpledlJY3U7BTqOURKcpiwIoMqNI8WY41Tp8EaPAYpBoIuSXid7x6wOWpwYbgtpQ/Fv98Pkng2FNL4ssaOXXSelk9+/iKYv0B05etbzviAPS/LG/PatHPZ0bD5x4JE5GLUIouYUioynQ/chs6zoBiedu3UIqVSbM4zfq/9Q/uJVXEttZj6S58SNsXw/Yk2DMryNu/RLTYD7HdnUPdHLOb0L5s5ZOW0JcKDKqvUz7GLQiGCgU7euiQ9SCqGCo8x3WE+2+No8obe1zho2gHly+6MkjYbfooDX3smOsw+ChfqZ7PEqog408gGKCApfGP/+h/5qKYuXs7U+6hy1zvCDF4l8pFrVwbIPP3pDFhx8pLUitB/X7oEE6Nd/+Ley2bHEuNARyOCS/IUvX8omh+0dTTHMrhCHRr4JkVsSX+/CJLirUtvWnPhhihJPhSmwRaKYtrTFAAk3UtYsIVAUw+vtxGtW0z3F3q4NlqRJ6LGSiiVZA4JM+kEG1dua7fuxCr/QSBSLMVFnz68gvn0s1BgwnfAHhQmfQkit95lYjjv5t/Q1UIYF2wlYGpuJ304r08q1G4CzTmes6QFovOc4iNChjWtUhwLU7lpRyVPjZ3OVWHDkBiVa79SmqwRjU0bLGv+8EJ+qTwQqpiIlAI/Cpzf4ZSioiAyGioNfclOH0YKJfQsX4mnSBvQQJtG+Lmuro0sn/lmkpFZvJvvFXjKO8Pqae5ZFVOtOM2cBLkEWwwWOm0+hCEChON+NbQHDCvCIW1VdWt2ZVVAGwUkou/R+d7xlf9HchKFy3bKId6jEvcNSIfDZ1yyem5D/XBBJYsvZE5h0tl4cMmr1rT0wZYBGQmMgzIue4PU9wtPDQwKbZ+JemQlDuhiqUl3FLvS1ExH4RtGSeARQLN+VqNMFuOQDgg3L/k1CnANiLDC4z75qkycuqxUAgG2HP8HAikx1sey2XmB1ii6GM7REkUqSkYJen4bn2TsZavlQ66cqen+N5PiNsXU7YYQLMRfbNIAgEdJHojbEJjsLfkvbRNDLbfESU3PRHHX6qbhPWCFHFPfzvsibon0/5RhVamYwJKe6tIUADW2746pPva62vz0S7BAG8kekA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79a1c578-3822-4a23-99a2-08da4a739976 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2022 23:55:58.5071 (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: AM0PR01MB5809 Subject: [FFmpeg-devel] [PATCH 05/41] avcodec/videodsp: Make ff_emulated_edge_mc_16 static 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: UoY5ijGkLD3d Only ff_emulated_edge_mc_8() is used outside of lavc/videodsp.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/videodsp.c | 4 ++++ libavcodec/videodsp.h | 1 - libavcodec/videodsp_template.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/videodsp.c b/libavcodec/videodsp.c index 2198d46c15..02af046b81 100644 --- a/libavcodec/videodsp.c +++ b/libavcodec/videodsp.c @@ -25,11 +25,15 @@ #include "videodsp.h" #define BIT_DEPTH 8 +#define STATIC #include "videodsp_template.c" +#undef STATIC #undef BIT_DEPTH #define BIT_DEPTH 16 +#define STATIC static #include "videodsp_template.c" +#undef STATIC #undef BIT_DEPTH static void just_return(uint8_t *buf, ptrdiff_t stride, int h) diff --git a/libavcodec/videodsp.h b/libavcodec/videodsp.h index ac971dc57f..b5219d236c 100644 --- a/libavcodec/videodsp.h +++ b/libavcodec/videodsp.h @@ -36,7 +36,6 @@ void ff_emulated_edge_mc_ ## depth(uint8_t *dst, const uint8_t *src, \ int src_x, int src_y, int w, int h); EMULATED_EDGE(8) -EMULATED_EDGE(16) typedef struct VideoDSPContext { /** diff --git a/libavcodec/videodsp_template.c b/libavcodec/videodsp_template.c index 55123a5844..8bc3290248 100644 --- a/libavcodec/videodsp_template.c +++ b/libavcodec/videodsp_template.c @@ -20,6 +20,7 @@ */ #include "bit_depth_template.c" +STATIC void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src, ptrdiff_t buf_linesize, ptrdiff_t src_linesize,