From patchwork Thu Jun 9 23:54:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36107 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp654178pzj; Thu, 9 Jun 2022 16:56:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkAAN6rM8aK//8r5CepwpajQgi+D4MbBgcjGm5B86Re1WM0oUV8KhESoi84fn9ougeQtHn X-Received: by 2002:a05:6402:1857:b0:42d:bcd6:3a88 with SMTP id v23-20020a056402185700b0042dbcd63a88mr48524351edy.6.1654818970936; Thu, 09 Jun 2022 16:56:10 -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 g11-20020a1709065d0b00b006f39ef3b072si19773147ejt.658.2022.06.09.16.56.10; Thu, 09 Jun 2022 16:56:10 -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=JjRpmO10; 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 1E4FB68B82E; Fri, 10 Jun 2022 02:56:00 +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 D45D568B73B for ; Fri, 10 Jun 2022 02:55:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F3VFYB24CgKE8JwOnb3aOXwSm8abR/bbw0s5Lm5DbGwSBMbJFEoOdgoY/zrROYaWM8TM6n+PIflmOQH29Vikz4kO2LU5Jx30G1p78/kf3HqZLUt5f0HrfI6TH3Oxx2n32eFHJTTbB2S3XlpPBQPs4TFU4vWpnswHHQ0p5Cn7LeHzOND6lROkaV0gTzf2C4pUwsVF90TLdGz2yk3mZ/UTh160m2/x6uRUL3jVeEu3HRVfYPbwu/O70Uyh8CKrCM9tcoTk6fWWjTYCop1QNgEmKkTtAij8qEQl00aJBf0SROB2tUtou2H7mnAByqWdKh5QhavnX399bLJtJDEJGizS/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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+BFGXk5W08HN7juwPpyrCxT8bomkdnCmwCu33+CLdCw=; b=hOE2JzNEDwSKRPogA3WfdyYoSjgjnOQAxRU7JSIWjfH7jdrR3HYF179FyCLHBi07plb8tyYhGdJFU61OsrSUkOA7iC6hCq92X7e1Xhe5RjJY/61s9AdfbYwyMLe1nHZH5N87cq6gPiXiFsUOkZJrEMgZtssP30wSNi4LMDt11QuE9B3WucUBDee19LoCvANtrbaN/lKy4iW5kPIloWBFsSFclBztWgVLQAhtaXVra0lxuELroD4Ta8pMwZr40NkDr4OddRoxClnLby2LMDr2TIASZityJ8rVr9Wf8FsNQ0aHLi1AiQJdUh7e9iZGPLi+pY2dhY0/vdBoJhdRrFyaBw== 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=+BFGXk5W08HN7juwPpyrCxT8bomkdnCmwCu33+CLdCw=; b=JjRpmO102f560FH8WB+CbfqEwBOgFbLvefrhS5246DDf6brTubwvHDPcZ7s+IZ8cK5MenPP4UjPjir4208mPW4ZP0RHwvgcLeHebDU3DlOUS0agm+V091RfnNH15E2scZ407xxja5p16dJ60I8UVpIbdiDqjI6ZwTdmRPqU9aV0380iHWvunGR9zfGnXwGYtHnR4yi8rmdhJu4wpgRMIrbI0Xcq4G+zIbofUrgqdomzXqgSk+wvxT4OY5038pC3443qWBv5lEk+CdF8ToOUJOsr1NVGL2NwsiMFnAMShy8OkyyOcBENnOzeaCqwEWam3BKqtc/AK1Rq9VMDt1/GG+Q== 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:52 +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:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 01:54:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [/MrRDxaFxgWI6C+XmuDprNRxEbHLCFXD] 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-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6f8b956e-efaa-44e1-398c-08da4a7395ac X-MS-Exchange-SLBlob-MailProps: sTyj/kSftouvSwbiwDu+Sg5DZpgBqDsaSpLCXLoxMnkUnQSqUfF3GfiYykY9gW98HX1s2OnC89cAAgwnlA3kcTQd1F3aezdis4Hif/bvJHMHE7aWMtly7aYaZ/QBbb5hUGePWgMN5DecAiqMCqlo8NrLI5DMVHhzMao1Kv72MTtcA/sktZZOdk/iiPLvzP0QchDzeYjdtR6RpjWOHR+LmHFQmJn5KOb6fTh3yCbdaf+shCdlWir/cKgrJIDtAUydUiFSmUFvd76XgLK6IF62rp1aJlNfV2AC02gZ6/YvNSi+64VR8/tz9a/XoGsEfLahOqSGDk9F9GGzq3RZfl1cyFjww5JbVpo1XMaX7dzDuJQlTEw9ZVC51QuZ8L4Gq4x/wpO1265v2OdT7Jwkw4yV40woGgtW93hoT267g4pXI7/iip7Gy3lLOmcK4iC4cZF+qyGtRkXAxg/dBiBDdDoeCF9LdEXCgsRWyVne8BwNPjw0ZwpsQjRVfHWX6BVeDH3rII/jkYVWDdDgsCppT37SiNDMb2T4Bt7PKQ0Gy/APcldeUSgC+FECSJjL3r11HF1h8DsJDCMLb0hB7dFRNdgOGz7tAdBWdT4PeMn1XE9EscXpLkFqXUqu7tFzc30R3V9IgfmwlX2G4iAyiHb/UQv2Crylg97GX1YdJWsi/qb1gIRLwuJR0aa8ZuKSBS1oyjVBxqBlt64tL2jNo+rApC4rr0uHLLLCbMJOCgRPrVjxd4grP7lAg+NIespi5ivsC2njYkuuWFY5U5qVoWuyT0jCAiuo4SUkia3uMgPxUMY39Sjlft6zi0cjO7TmxsnmnPKQjxNnOz7zP61uoaaLrpLMUw== X-MS-TrafficTypeDiagnostic: AM0PR01MB5809:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ALd9cwNQJojmx5YNJFOhMVx8CQt+gKekjlBZztMGZX4AhyzgK+TH85x1MHtvzVEUCaJQ6sPxW8uq8uIH6v3gIVPkyt9iqcf6dzyq89W1sdzXKpYRN8GbM8k5hO3npWGLRZPWgBJHqdxCwLWEZCqekY+SqVJXeE3g4imCkimwScVxrngtgLeQ943I3utFRL3RQBENXXNTPeJyyElYYu8OKxMegOsTFhfmeh2Sgvy7BOAnjrFEzDVqxId1J45Xalv1FijuMvOA4PA0WTkXmebbhwVN2Fls3jhkTIgFcVM4A7eqJ0rPHiltl/4xI+XDknNL7l8AXV+7Q8ccb/b5FR1ZSvf53T0o+1AWUSgYG8JZHhgECrigdXr+CqB5WMxbV3RCHnFEWaao00Zoqt1tolGKl+iOgie/rKfAomijehd/wgAgTvIazfFG9ZAS2vB4uAgN6QjKZN9qqNu97wa3gqvkrTOFZABNFwijWbfmPOfZv5PE9vv5xDMAQe/Pl1kHotY5DuHxxdNgUHpxzA78cZXbGMJAWvFAKXFSRBFCOkPncBe3+x6xQJ8cQIb1oM+nwA4Lh8qU0NraT8EQUG0K29L5EQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NCmqSJ1w2jjdFz9r9an+0e2opPx6W126oXe/mFaDl7YqhBWcu0p5iP2nC8S68GBDFNXt6M6FIJm2KpNsbxe7LvbuRKs354OhSwyL77LyXi0fdHuwBtwr+UDbbsM5Kb1J9lqpgz5gSkBu4453s25r8Qdb147Su3cyWEmKK+EleHRlm4L+VQs3tpm4734fuEchfhWje8oHTG9A6GkkAXrzy4R0nf3Fgnz7bB9sBpwG6+rWqsfUpVSEjqQr9ex9G+Jf6kzal3O/PKDRl9kDoSYTVGwaQGujqtAe9+mja9LzHiDU8StDe5QPEqveNzz7O2iGqWiOsNlsS+SFs2FFtGA9YAfF9LS+0vY2wXefJYFHNp64/LZyz9hU7ST4T3hgyeO+EV+HC3PNgdX/fCNnjV+yVbjVMQpnB6ZN36n8q96hs9+A19YKb2QXiqosv+3SyNnpcbYUlKjpSC/epxNj43PjOzy3Lf9hFBEw7VR5rfVg2w9L4IqyLesCQ7GqtMFFBx+Fo2WHs2JZBFff91msKSPlaLMMgn8Dz3v3De767ZHYYOdI+YvkTZluL/xIJNZAqyGjugpzANFZhXhKrxuST4LopenWaZqSsmkcGchRKGVFjHy7nKM9RxyBIO2dS23AU9UQmmMGZb5gii3koJRblG88+gSga87QcjfWnA1DXkp6JR9r63WiCuZ47dJ1YvCdVZYmZ3VcUSGrWJ6638klsGbRiYnxR6bOo7X+O57vxPbCZErEAB0eycW7qAHFVNFG6I8jiWSXddLSL+BLPLXJ9W8qUwByBf9T9cOna09kO/OgZCzjvvg7XRZxjdYTJKoZoR4l3LDKRGq8c8FPHTMEe0Dwt+7nNCIFyRcmLj74dLXxznPDUVDU8n6MOtabihJpKRprfSSxQyr/ItXrv/u+MBNksa4eaa3BZfNeh8Vuq3nlhtgT75Dz4yqmfQNvnY0tkPQG00o37pdyVymyknc6mfRMygp3bxKqUaaTkXOOE79wxE8zwhfPMVs3vljycvZyTSDbcvCq7hJmNijrfVlleFjQPnfywlMyGsiH9fQxB8U0ukoJaJ5VUjknNKrcy7maWb60d+Hw6gllw/aY04m5vnoCrhMslP2nscxFQp/grikw4uJA0AhJ21mOanRAVJ2n0bWv3jKJ7sHLUl3rNul+5iwKRcMfrjmwK+HUyi+iOKJYkUOQlpXD3gtC4Xm8sn6/FWIQ9ZfdS3FKFqGSjMUaQCLHu3iIXIUMif1/L6VUOCuGJc+y66kAWcsV4UR/CR6IKFl937+7lYYecDOReCMRpJLvHLdgdPNISzh8evdRAV6NS1IBLx6zNUvFQkJq3CN1SE+vrFs549W/WcKkqMK/X+Su5/eiUAZeZ7SniPB+4yQjcTAxCv5Kdd2uIQZA5fwD5gO72KggaBJKocG1cPRglT6xBqYvDKVaeIyTNq/v2S2L6/lgJUTs+RjknK/s6MENNYHhEotqQTwfTFoLiHRHdOO3Fw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f8b956e-efaa-44e1-398c-08da4a7395ac 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:52.1633 (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 03/41] avcodec/hevcdec: Make ff_hevc_pel_weight 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: rnEklP/7GfXa Only used here. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevcdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index f782ea6394..e84c30dd13 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -52,7 +52,7 @@ #include "thread.h" #include "threadframe.h" -const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; +static const uint8_t hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; /** * NOTE: Each function hls_foo correspond to the function foo in the @@ -1509,7 +1509,7 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, int my = mv->y & 3; int weight_flag = (s->sh.slice_type == HEVC_SLICE_P && s->ps.pps->weighted_pred_flag) || (s->sh.slice_type == HEVC_SLICE_B && s->ps.pps->weighted_bipred_flag); - int idx = ff_hevc_pel_weight[block_w]; + int idx = hevc_pel_weight[block_w]; x_off += mv->x >> 2; y_off += mv->y >> 2; @@ -1576,7 +1576,7 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, int y_off0 = y_off + (mv0->y >> 2); int x_off1 = x_off + (mv1->x >> 2); int y_off1 = y_off + (mv1->y >> 2); - int idx = ff_hevc_pel_weight[block_w]; + int idx = hevc_pel_weight[block_w]; uint8_t *src0 = ref0->data[0] + y_off0 * src0stride + (int)((unsigned)x_off0 << s->ps.sps->pixel_shift); uint8_t *src1 = ref1->data[0] + y_off1 * src1stride + (int)((unsigned)x_off1 << s->ps.sps->pixel_shift); @@ -1658,7 +1658,7 @@ static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0, const Mv *mv = ¤t_mv->mv[reflist]; int weight_flag = (s->sh.slice_type == HEVC_SLICE_P && s->ps.pps->weighted_pred_flag) || (s->sh.slice_type == HEVC_SLICE_B && s->ps.pps->weighted_bipred_flag); - int idx = ff_hevc_pel_weight[block_w]; + int idx = hevc_pel_weight[block_w]; int hshift = s->ps.sps->hshift[1]; int vshift = s->ps.sps->vshift[1]; intptr_t mx = av_mod_uintp2(mv->x, 2 + hshift); @@ -1743,7 +1743,7 @@ static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVF int y_off0 = y_off + (mv0->y >> (2 + vshift)); int x_off1 = x_off + (mv1->x >> (2 + hshift)); int y_off1 = y_off + (mv1->y >> (2 + vshift)); - int idx = ff_hevc_pel_weight[block_w]; + int idx = hevc_pel_weight[block_w]; src1 += y_off0 * src1stride + (int)((unsigned)x_off0 << s->ps.sps->pixel_shift); src2 += y_off1 * src2stride + (int)((unsigned)x_off1 << s->ps.sps->pixel_shift);