From patchwork Thu Mar 28 23:10:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47612 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1668146pzb; Thu, 28 Mar 2024 16:13:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXTcM3cePBIK0xMyNPf2Bi4DBc4RlXGy37UTtPnjCo4kqzycQRm0AOqu7kJyPeEz7vCXilX9TxxB6sEhcy8djZmh7Sb3UXEnpoOFg== X-Google-Smtp-Source: AGHT+IF16wBdYOuWJIilQzQJlIBxRiFrCv3r3XPz7M3e9kxUlwTj4oL4N6iarXQkoV2MpanXJlmr X-Received: by 2002:a19:6408:0:b0:513:ec32:aa89 with SMTP id y8-20020a196408000000b00513ec32aa89mr540161lfb.2.1711667603601; Thu, 28 Mar 2024 16:13:23 -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 lj26-20020a170906f9da00b00a4e2a64a3b5si539047ejb.1047.2024.03.28.16.13.23; Thu, 28 Mar 2024 16:13:23 -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=dx0qFJv4; 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 B746968D7A3; Fri, 29 Mar 2024 01:12:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2079.outbound.protection.outlook.com [40.92.75.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A9EB68D789 for ; Fri, 29 Mar 2024 01:12:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lr15atlR3Fp0aejx2P1F7Hk9wWTfPY0564/MYeL0dsW8ZmH6mqRyx5+lIgNDpsYYSDzR/QPvO02Z2NgpHecW7fdpGnVoeNtADO8wggE77oG34Oh2YZsHizHNFl5wIF1dzP3C1DbWwQyEIFYZhB+jtYECwkP2UK+aWKKjEycalcSSsvFi0/qrothL6H/SHe6CyShmh4x5ph7YCyfkNLsZsLWXln1MnCWsNQ4ZXD0cVDsMY4HxoP4lwDECRF9p+r2/cUzc8t54KXnZ53mhpIne7zFxt3RDYLAVk1x+nn0L2jMtA5M6L0UrpKkK70olRQNIl9sQWlIiwEoWmq15YB8Xpw== 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=A+NDOmLHWl+AgGwZxHf5Kjgf0C13S5f713Jw7h6dyuo=; b=hs9WNJHHWFLwsIKhqXhnr1aSYiy13/kgWqeqCSscyayR54obhz+bBlHBnJxvcf0blBcZbZLsfuuJmWFY+wuXLhw6TNmAVnSIJjCL8vxkHDxAIrnKkdR29/3HMaLq5t2AMXnnak2rEl0rGIRPVhtU9B732yZPVY5FsVFPi1YNvFWw6CeDtpJA49cGuoAkx/zgzUtxjJF6psCnH6ketP5Cr8ol1NPvLzU7NLKiy5QTfqyFU2Dm2reZYhbGJfBmbtGkvn2isUPBXWc+wrxw5FkjkeGnyNBMANa895u00ZOBzb92FVw2XX/5/QtPsrrHy06gA05BqPma5lZU+FpuuB+RXg== 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=A+NDOmLHWl+AgGwZxHf5Kjgf0C13S5f713Jw7h6dyuo=; b=dx0qFJv41z/wYu7tElEGNZbMqTVjIh/NJSttfTVODStvcIHbrjhXDHDEEMnDLNOpHtRUVgYNaoXZyj1urSatAYAJQ3Vy2gpaUDvv1QcPAIEco5URBcjbXCt4EMOykkAFE/sWp6XZcARhhYaRNxfXyN0Zpbo9DjZxZpz9JCXz8mACT3dlwUH4xdG3VT0Odgoret3fJuWThYa49LIqdfMp5WlpLGBv00GhtiuuBfxQc9vlDS2wWhmK15yPqn2fwn6TTibsT3x4uz92vwM2p8BdaTKZ0TAvDau+rXrQh72ic8INw3LVuygOEI28y+xLUQyRb9GudcX+mzdSYm88MJ5XEQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0553.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Thu, 28 Mar 2024 23:12:07 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7409.039; Thu, 28 Mar 2024 23:12:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 00:10:46 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [qcs4Z8fQhduSTLqsGPHV6jsXhwogpaQtak1cohE9zx0=] X-ClientProxiedBy: ZR0P278CA0093.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240328231047.2202386-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0553:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ac44747-0819-456b-a057-08dc4f7c7cd7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5TquVrFcFYm8Wfb/B8DpRZxRgEcqcbIYE9K3zg7JaFFrxl1iXAy5YnNZcXysuxwyF+LaDUOJWiUuptKaUQZ8aTxaeVP4S7UdluTMp+ed23zzJ5tx3wh01BkDuSe7+uLn9jXGsHtGWuMnwQrYt6l7f7/Z9w5cXk3GazEi2GlpayQfkskwooSXgY0Ib/TE0uUg/o6suOLO6u7VGaxv4zD6xzEe269IhObH4SGgi3Exo/xpZ5xbBlF9H9DY0A+kj46urY/In3aRyFr+YLQKbpDDLvb4XTEpDAf7c0VWEp1aOIQWhF/veVJ4/LgSNq4s7oUgMF+20gJPp3/oVahfxarQHiCbudAYaJjikG/oQvqEgHCwxpT1Kr4fmLry1nRFsx+zp7KsMHbVTIa2kXrmaQJKJmunVZe0FVJhPqv6UflfHaBFFsroqJap0QmRkv2qExRpiac5DtzYzQeJSeDMaW5ySsuW83YPA2CG+ynzj2uR1UvnlCFOel9w42tAhkWL5uquh5RGQABb4ccCQm69VR7hi06w2lajqjtGt2Pb5jFTRVD5wA/lNcrs6wpC5We+x8WZTr3dlAPBFvN7jT1EvPEnd9Otuqd3LJ/ueYsgw4RdhGV1T0mfqIlwyDIBErA368bucp/MxBafW4FJIs4wRSEDk77/siOO4V61AN4vh55mHtmQxqh3zW39+I6NMORAJuI7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7EtRUsnOFxxfmxEPgnxvVls0JPJ2zPk0vPsizX9P1NBWb/dn3HUErR4F/IVNu8cWPZ3GS56dqFAIFZbMptqXT/z4+xE211OhA9EN7DWGSNnJp4CmUaxlUi39pMAfLl48IL+1dyfJ5MLnWCywh7V1Is55uK/fQrrrTl078qAgoARFBwZRz7ZrdoIlhOJsBgWEHyfWZ7xx2xo404F3Ft98eDpAvrth1hGH5nHTboWooxoYsqyVcfBhC46Gv+KNh/kWV0im7aDYZR+kX6sl0fybJRmqsyMqP15Jb9o8OQDIk62C49+i/pMcvMikBAIz5VWZH2ZWqf6G1eYOKqF5noTwAE/LvZGXvNwvnFiUmKupJQDPs6ZKTD6dXwHs3XVtz+cHufuVzTt6P5YGy3q5gABt0EG+bLXNjnNKn6I+uYQNJZlYrsDZxwBhaXKg9Wa1EjDa7SsLr8uaZw56hapXZ+sOshQuq0X418z/ONeJvuP3YFTAZXU2MY8ctoHMr2YM4dpwR7+8Z7aGXT6tnqbXv1GalzeeaFPA/J1HQkDOViR9d0sKarfKpDs3tL/B9yDh+MkfkdJFt8wcohCCL5BCMbGmvTEDm10bhMueKyVk10D5UiGzVw1H/FMJa3iVQV2xwMYP7p2X+yDVApHcKsAkYCwt6X3JLYeLhAaLiG3VeBVeA3+Y789yX+0Bd3NzPs7ybYR84Fmjwo3Q6G1aRNYc9Cs3Nb/P2p/KuNsh30F83hM9iMavUfNjrSqBVEebXDutZQ4kyiiZgLtk0t2RitGvv8PK8xQYb8i1q96iJz0mJbucIoSdzrVndCj5++rYfjxVd5G0kDiIS5uawKIJEosyuL1N4koiB5EQWSP6m9ixQx+h4yVpZt9Tkh+AWqxaprVKkanOseeSMa2IJnCjSluis/rJRQcPdEozTEWBaKsLKMH8SbT51YZwUyjvOZKVpaGJNSGdH6tarMh08qRnO4eUoTv/UsQzG0jnxXKdM1RPz2ELsS/m+Q7P5He1IC4vTfojRrleWwdxCC08m78D1WRZIB/HFlPqOtRIGsJQ/Qhc8mAarGPScCDYAI+IJSojYubSOOJndkbDQxHTzL3/+4N7S2QJ3BIOioZrt6yvCG6uphWy+8PRlFFXFmOZYqe8AfF/H+Qny13xcd1LS1OTB6thC8+8CABOhgmc3PUrkCgutxHCilPuU89hcNPtl+RDH6pgTqkAS8WQsyZfPPfJKm0p4wooKbZ8wTTzJHxAssccueoeDM/PhfZd3CwZRozEeqTojZbq1O4fJEFLpFcKDawNFZa6aA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ac44747-0819-456b-a057-08dc4f7c7cd7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 23:12:07.0494 (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: AS1P250MB0553 Subject: [FFmpeg-devel] [PATCH 17/18] avutil/internal: Move avpriv_set_systematic_pal2 decl to imgutils_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: hUxHcU5F8bJg Signed-off-by: Andreas Rheinhardt --- libavcodec/bmpenc.c | 2 +- libavcodec/gif.c | 1 + libavcodec/pcxenc.c | 2 +- libavcodec/xwdenc.c | 1 + libavfilter/framepool.c | 1 + libavfilter/vf_scale.c | 1 + libavformat/av1.c | 1 + libavutil/imgutils.c | 1 - libavutil/imgutils_internal.h | 4 ++++ libavutil/internal.h | 3 --- 10 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index 3e3ca324ea..48f25170ba 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -22,8 +22,8 @@ #include "config.h" -#include "libavutil/imgutils.h" #include "libavutil/avassert.h" +#include "libavutil/imgutils_internal.h" #include "avcodec.h" #include "bytestream.h" #include "bmp.h" diff --git a/libavcodec/gif.c b/libavcodec/gif.c index 56042d36a7..c36fa66737 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -30,6 +30,7 @@ * @see http://www.w3.org/Graphics/GIF/spec-gif89a.txt */ +#include "libavutil/imgutils_internal.h" #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avcodec.h" diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c index cf9b41b752..b763c7df47 100644 --- a/libavcodec/pcxenc.c +++ b/libavcodec/pcxenc.c @@ -26,9 +26,9 @@ * @see http://bespin.org/~qz/pc-gpe/pcx.txt */ +#include "libavutil/imgutils_internal.h" #include "avcodec.h" #include "bytestream.h" -#include "libavutil/imgutils.h" #include "codec_internal.h" #include "encode.h" diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index 08554d8632..40bee20109 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/imgutils_internal.h" #include "libavutil/pixdesc.h" #include "avcodec.h" #include "bytestream.h" diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c index 841caa0460..e8621e07ac 100644 --- a/libavfilter/framepool.c +++ b/libavfilter/framepool.c @@ -24,6 +24,7 @@ #include "libavutil/buffer.h" #include "libavutil/frame.h" #include "libavutil/imgutils.h" +#include "libavutil/imgutils_internal.h" #include "libavutil/mem.h" #include "libavutil/pixfmt.h" diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 00fcb31b1c..fc0e3802db 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -33,6 +33,7 @@ #include "scale_eval.h" #include "video.h" #include "libavutil/eval.h" +#include "libavutil/imgutils_internal.h" #include "libavutil/internal.h" #include "libavutil/mem.h" #include "libavutil/opt.h" diff --git a/libavformat/av1.c b/libavformat/av1.c index cb86e66d09..35c23dd0b0 100644 --- a/libavformat/av1.c +++ b/libavformat/av1.c @@ -21,6 +21,7 @@ #include "libavutil/avassert.h" #include "libavutil/mem.h" +#include "libavutil/pixfmt.h" #include "libavcodec/av1.h" #include "libavcodec/av1_parse.h" #include "libavcodec/defs.h" diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 16e3133c33..d246381563 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -25,7 +25,6 @@ #include "common.h" #include "imgutils.h" #include "imgutils_internal.h" -#include "internal.h" #include "intreadwrite.h" #include "log.h" #include "mathematics.h" diff --git a/libavutil/imgutils_internal.h b/libavutil/imgutils_internal.h index d515858413..3e47731a50 100644 --- a/libavutil/imgutils_internal.h +++ b/libavutil/imgutils_internal.h @@ -22,6 +22,10 @@ #include #include +#include "pixfmt.h" + +int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt); + int ff_image_copy_plane_uc_from_x86(uint8_t *dst, ptrdiff_t dst_linesize, const uint8_t *src, ptrdiff_t src_linesize, ptrdiff_t bytewidth, int height); diff --git a/libavutil/internal.h b/libavutil/internal.h index fe0b9d7a24..ac1af367e9 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -42,7 +42,6 @@ #include "attributes.h" #include "libm.h" #include "macros.h" -#include "pixfmt.h" #ifndef attribute_align_arg #if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2) @@ -152,8 +151,6 @@ void avpriv_request_sample(void *avc, #define SUINT32 uint32_t #endif -int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt); - static av_always_inline av_const int avpriv_mirror(int x, int w) { if (!w)