From patchwork Thu Jun 9 23:55:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36130 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp655916pzj; Thu, 9 Jun 2022 17:01:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVgacYD/UvOsUo/fslx1mU//d9SZuPfy4ohovdZwYAX3GAHHcncjQwVfszbOgnIJy5Lh3K X-Received: by 2002:a17:907:d05:b0:6f4:3729:8e36 with SMTP id gn5-20020a1709070d0500b006f437298e36mr37360146ejc.475.1654819276736; Thu, 09 Jun 2022 17:01:16 -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 jg35-20020a170907972300b006f40efd4b88si7791869ejc.812.2022.06.09.17.01.16; Thu, 09 Jun 2022 17:01:16 -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=rLjtxZLW; 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 41E6868B91A; Fri, 10 Jun 2022 02:57:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073085.outbound.protection.outlook.com [40.92.73.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE65668B8F6 for ; Fri, 10 Jun 2022 02:57:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UWbnhT4y9r5ikg7C0rUlz7DWCj7rmhSXers0EVPQOtnjk0WlMvCELIGqrTmlCSgkQY1SxBPpqlG0wwzuEdLAK6z0WjLE3EIoHeB2d/P7FKgRLhsVsvasIEr1Qmi98j0655GkyEvrxq0oBqER0ejz3U0mr++MmsdpOuzcxMsF1qsZH7RYhI1qoXmqr//i3eyOFwk6WgPBBLVbu9Smp3pymPg0Ar3AiMZ2TfUL1DIsEo9hOMtO+mBWXdVf9UYXs83tBLrBw/XolHQe63m9k7y2TEaiscqb6C2Ibns0BgVE5+rJa2VR5aXUHNDZu9qms09Cp6/8zuxnjV1U0FcnKg7Qng== 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=3ucyKEhwG7jgVdKd4PbuGcga9UnmRPXcoLl+vsKacZ8=; b=kw5XEjAh0H/12NtQZrMW91kHPSK7lCT64nPiNEMOcXVzct/HfXVKkjw+CJFX667FbpKDIW9VYWczZSTtLBqYTUsIxy+GX8xQYaI5sx/r9cv2SwOtcz15KNa42y3FG/+4u7f+jGBHxZKRFSKQbr7OZKmXxBq4mVQAQ/SUGlQnaHRfjs3FucfH+Pn1zqRTFcMuF1s8trkZmtw+hVoo2ipm0e4M0AsstpAOzTKFdnaAGXr9ZnhPOyL6Sw37+Ohi8ZRGbykv09gsjaf8bkltCrJX07HkkgDk+kF1bjiSbfsfPrGk/O7Dy50P+bXsMqIMhxOQoVlfBiXb1tW5pUIrLfcgYQ== 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=3ucyKEhwG7jgVdKd4PbuGcga9UnmRPXcoLl+vsKacZ8=; b=rLjtxZLWxl10p8WSmfmBUI8/RvvVkeazBXj96rKsJsgZKIegCNQi7pGm/yVL3I1jY5BGWpWtJBQyjspDruRXqern0PaXWOB1b03hMTyG4tNbS/L0Iihs5jbc3DKML2XEoxFTcUcNChmNat204AffSIqUuLleMLEWYZDAKBGUMFLZP9Vq1DLl0r116l8m62kgaFY8YIFkTPjJuoEK3yer/3viQeF/Rb3+Gw8kvpmV7WIZZxnw+xH4ZED2bqFW+SreLsS3jwjQJaP96DLOPK9HgRSPP/Dx0+KqBl0pAsD2YUF4JAILZZNL0glziiy0swZtYffkYoSpp75BE7YU9HhPiA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB6PR01MB3862.eurprd01.prod.exchangelabs.com (2603:10a6:6:48::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.15; Thu, 9 Jun 2022 23:57:11 +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:57:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:55:14 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [z+eUzdQdzX59/LmGBL96SinJIcnMtfdv] 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-32-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8559324-ea86-49a1-cf21-08da4a73c4e1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SHbtEySq1lKtZ7ZnKz1Moez84Nz9n+Fdhj7YbqHuMC2KID9QWPXTsoQPMIMUXEche/U9EY2gFiLP/DTqB980A7adRjWXZNd0s4MDNChALUzTdaJcvw2Qs5TcpU5PKtVmu5dj5DmzuwB6U2nzKVLtdhg5xkH3tK+6ahPwwhgZWAcTb5a/z7yQZC1R9kzrIDmv9YqsEX5eWeiGHjjBORCP45pbSHUrPY80lV6S+Ki/kA5zyxX34TErRr3s88aBOAR4hzMMD7L13A/7OzAuxIIjMXc7nnNTlRtUfa5dqKHiDTz5n4ABIx6rcUyzcJUNVsy0F2q+kZWNc+Junf7C1oSDXXzvisHWYf78QnRWD89i+8O+9ToadXqSNQIMaUOiaRIIwUqc+YwULr+zspwJCp3USggM30H0S8bY5nuJKHjelTe03gdrX0LKzIeE1fuXD9ZhgnUaWVmlvaDgPxZARrqWfxE0n0tz+/BYQvPdZ/Nc6n4/MnZ3yw4E88Mi5LPqGcp1odzNRO/ezZEAIxpaF7Bx+sYLgW0vGw7LELB6fnOST1TQW/ONSeqe0t4Xei0Ow/PrRUkUvPinHLR3ibur5bg5p59+nsy5VOV8PIYiw7OfXbgEMpcSwUEKzlsN/TKPqK1xYoxqUCW048f5jVs322b+cFv4TzgTBAUweV9jUIGnkFi265xdTOn2IPrTMC/nwAu54DPI/L3WpelosKCNqyUMMNvtPxFlfpC5jWLSKmXJj5m389cL3vabwY= X-MS-TrafficTypeDiagnostic: DB6PR01MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dClUSKX8Vx9hXpGT27xDzI4KncQ30CZy+drKmIePFUjkNk9YKZLQzN/joMxiI//j+9oAKSR1sh784xBPLiR0ob05EA+H8VGKI+DbI+PgChLa+cl/B+BWjC0jt7EjWXA/qkLYt7Sjk/KBaUqq0v9kjuLS/oDJWh/wSJksaBZRHuDFVA73QSPVCon5umtH1iQL1xiCBLFexnXjzyExZ5A8DHLGGyvtgN7G5erwhvnuGuqBKY86rxke2ne7sLoTQ14EPkB4ZgKn5GEoGni9fj2dZYAOZ8FOjYrlgAuByIefJq8yVdt3GvTyYd9GwFfcfgChq9o8N/lRaNYt5sIb2+9o667wmeayl97gxgFtgM8ShHIDVCjWqQDDQs3rmeE2TJyf1o56Y2r2K5nYeRQil7bsq6t/XdtiHzqeBtq2zMIxZ0Z87FKzRhRrq2mIrMqB38YtZ0KdEGGmDR+9gDhFvYTRmCzYkTsaAjCdp5iKX0yTMioliZ+pDmFzsRKGuDdFx4g7c+GCch8ILi78m/7tiHQ5CowIo2nmLqZ9tV9FNamwG/lJZ/PojJXuBQvqIGmqrWQ/WSPR2te+LSczievjuch79A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 973QgPW784f7CbrumXoJ7ktbThVmcF6PCBX8DJ2hwuVVEIzte0JKWEJmnlU/O0+wc9nfoWm75+YNlzRRS+hnmis13fGIfFy6MVT8smqO3I/Aere2E78s1y22ecAuucexMO55w8Kgg2n+8JlaKcTUkfbD+t/Leruw1sqKVA53sc1e8Y9TXwGM+UOToBew0VQLY3nNG57tYCssGa8iGJxqpZ/v4+tf+kWGbD0xPZuI93rfnDKDM99ECVXp2Oe89p4XzFZEcKB1nDpHwEm56LJAoD2Rd5s+Ptc5dvha0Lfayi53XTGZeWAHMqUxy34MSnlLofUhhOMdBcdQByl424zcGIwo7deJnD51Megj3koADzyfc1V5ZzdIIrGd3zu1WpMX7pf1X7o5hlsh66Jcz2a6HhSIx4jpFan+sU3WVAdBn9xOVXzYooj+HqmO4gPV6ocfRu4OT+5MGFTULiKK5sr8Rq5s4uRA/fu8vmvTg+Lwl3bx4gBYplEKm4b713Fjh+DLiSGFh/MQVxvXLoVfMrHpe8w8mqjB1Bs5Q+hj2hDI9x6temZvpHb5BW4tR2q7M2Q3/H0b2592YBtGKJJh7uJUS+VzqOhz253O7gSBBC6fs7j13cNjqlYCO7vaozYBr94zj9kGeD+fKbJBiwRSve6Cz5CY5L+Q+wsue/x2g8kaZ59eLvfRM3P3lIelsE53zO7HyDDpDV7KulLIPFh9ylIKb5YPOG51b1LBbuVP0CUf8jJvdjTIpXIYhLRrRlmcb7io6aV0GmWG9y1IoAnCKQ2DTKmk8kQiChpIzeiUPoBs8hyEV5iWzpV03aXjAqMzrygtieUj4wzo0dUcOfTG2+zOo/F1ScxOC6pEerU9Rawn6ZWXB3nOtUK9nOLzhY4miz14F/I+3h+sC/q8q2v5RD2b2x3L5R3iRdN1bdtWQYIbxZJRN2rGY5GhHzklqrxzmVBs2cJTyRBWNcbnUIgIKl3JoRtns8iL8e4FdKiNQcCfN8xvfbe1DhfQ18GDSmxJ0fZsEg7V1D6aeN+ctyPvq2G5xZNUE0l7RLSscBpvqi2q931U79VK1UI+1rgt1Yx6WjO4yoQTO4g6svMR05uADkuwndr0LH5MKV+5mjmPDZwwVGwlmhW7sDspRjUVWWITzcVvYNuCzy3spkJtNd/kLgeBB6EGeczHTBSAsGsEx8miLJdVWoorSzjGHClWai8qja6F+Zjvd1Pjbw/H8QVnsgVdgr7MY8me+WPcpMzmsxUIHY5d7wp+Pdd0vbL6THu0HFrVWkNKtNFZ83i844CaiaE3IkWIjDKMGjRd9Fkaf4sxPbHSVzS4mrZYXcN//tGQ3r45Px4+uzAfnoQ1H1oyDrunJhfCqjolZQA8bWMM5j9MxmdQnB4+PsdJqsBj6mfLx+nAzVEPC1ND0VpW8AZM3zeGIoVy8b6cQ+ZfsOriqacUPyzhQxJH2kInH9qJtH01Zfdz8Rl/T9H37cmlYGNvJhWucg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8559324-ea86-49a1-cf21-08da4a73c4e1 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:57:11.3673 (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: DB6PR01MB3862 Subject: [FFmpeg-devel] [PATCH 32/41] avcodec/x86/h264_qpel: Make functions only used here 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: aBiM4nfl3Bn6 Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/h264_qpel.c | 44 ++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index dda50ded89..fd1070247b 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -409,13 +409,11 @@ H264_MC_816(H264_MC_HV, ssse3) void ff_ ## OP ## _h264_qpel ## NUM ## _ ## TYPE ## _ ## DEPTH ## _ ## OPT \ (uint8_t *dst, const uint8_t *src, ptrdiff_t stride); -#define LUMA_MC_ALL(DEPTH, TYPE, OPT) \ +#define LUMA_MC_48(DEPTH, TYPE, OPT) \ LUMA_MC_OP(put, 4, DEPTH, TYPE, OPT) \ LUMA_MC_OP(avg, 4, DEPTH, TYPE, OPT) \ LUMA_MC_OP(put, 8, DEPTH, TYPE, OPT) \ - LUMA_MC_OP(avg, 8, DEPTH, TYPE, OPT) \ - LUMA_MC_OP(put, 16, DEPTH, TYPE, OPT) \ - LUMA_MC_OP(avg, 16, DEPTH, TYPE, OPT) + LUMA_MC_OP(avg, 8, DEPTH, TYPE, OPT) #define LUMA_MC_816(DEPTH, TYPE, OPT) \ LUMA_MC_OP(put, 8, DEPTH, TYPE, OPT) \ @@ -423,22 +421,22 @@ void ff_ ## OP ## _h264_qpel ## NUM ## _ ## TYPE ## _ ## DEPTH ## _ ## OPT \ LUMA_MC_OP(put, 16, DEPTH, TYPE, OPT) \ LUMA_MC_OP(avg, 16, DEPTH, TYPE, OPT) -LUMA_MC_ALL(10, mc00, mmxext) -LUMA_MC_ALL(10, mc10, mmxext) -LUMA_MC_ALL(10, mc20, mmxext) -LUMA_MC_ALL(10, mc30, mmxext) -LUMA_MC_ALL(10, mc01, mmxext) -LUMA_MC_ALL(10, mc11, mmxext) -LUMA_MC_ALL(10, mc21, mmxext) -LUMA_MC_ALL(10, mc31, mmxext) -LUMA_MC_ALL(10, mc02, mmxext) -LUMA_MC_ALL(10, mc12, mmxext) -LUMA_MC_ALL(10, mc22, mmxext) -LUMA_MC_ALL(10, mc32, mmxext) -LUMA_MC_ALL(10, mc03, mmxext) -LUMA_MC_ALL(10, mc13, mmxext) -LUMA_MC_ALL(10, mc23, mmxext) -LUMA_MC_ALL(10, mc33, mmxext) +LUMA_MC_48(10, mc00, mmxext) +LUMA_MC_48(10, mc10, mmxext) +LUMA_MC_48(10, mc20, mmxext) +LUMA_MC_48(10, mc30, mmxext) +LUMA_MC_48(10, mc01, mmxext) +LUMA_MC_48(10, mc11, mmxext) +LUMA_MC_48(10, mc21, mmxext) +LUMA_MC_48(10, mc31, mmxext) +LUMA_MC_48(10, mc02, mmxext) +LUMA_MC_48(10, mc12, mmxext) +LUMA_MC_48(10, mc22, mmxext) +LUMA_MC_48(10, mc32, mmxext) +LUMA_MC_48(10, mc03, mmxext) +LUMA_MC_48(10, mc13, mmxext) +LUMA_MC_48(10, mc23, mmxext) +LUMA_MC_48(10, mc33, mmxext) LUMA_MC_816(10, mc00, sse2) LUMA_MC_816(10, mc10, sse2) @@ -464,7 +462,7 @@ LUMA_MC_816(10, mc23, sse2) LUMA_MC_816(10, mc33, sse2) #define QPEL16_OPMC(OP, MC, MMX)\ -void ff_ ## OP ## _h264_qpel16_ ## MC ## _10_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t stride){\ +static void OP ## _h264_qpel16_ ## MC ## _10_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t stride){\ ff_ ## OP ## _h264_qpel8_ ## MC ## _10_ ## MMX(dst , src , stride);\ ff_ ## OP ## _h264_qpel8_ ## MC ## _10_ ## MMX(dst+16, src+16, stride);\ src += 8*stride;\ @@ -553,8 +551,8 @@ av_cold void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth) SET_QPEL_FUNCS(avg_h264_qpel, 2, 4, mmxext, ); } else if (bit_depth == 10) { #if ARCH_X86_32 - SET_QPEL_FUNCS(avg_h264_qpel, 0, 16, 10_mmxext, ff_); - SET_QPEL_FUNCS(put_h264_qpel, 0, 16, 10_mmxext, ff_); + SET_QPEL_FUNCS(avg_h264_qpel, 0, 16, 10_mmxext, ); + SET_QPEL_FUNCS(put_h264_qpel, 0, 16, 10_mmxext, ); SET_QPEL_FUNCS(put_h264_qpel, 1, 8, 10_mmxext, ff_); SET_QPEL_FUNCS(avg_h264_qpel, 1, 8, 10_mmxext, ff_); #endif