From patchwork Mon Sep 6 12:42:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30045 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3722161iov; Mon, 6 Sep 2021 05:44:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7YNmCnW0NOgceX3wFsmdvdt8n7pCqs+rfNi3yoDCA0eNTY/a9iqgcD8ovc1W9hOS8po1H X-Received: by 2002:a17:906:52d9:: with SMTP id w25mr13188076ejn.464.1630932254107; Mon, 06 Sep 2021 05:44:14 -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 gn14si7956786ejc.279.2021.09.06.05.44.13; Mon, 06 Sep 2021 05:44:14 -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=QE7xx90h; 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 2F01568A630; Mon, 6 Sep 2021 15:43:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7506F68A5F7 for ; Mon, 6 Sep 2021 15:43:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LhqXeZPXjel1rEld5JAAiIUzYYUPlimfrdabhaXZQDJfV8q/E7aO09/aLd0D+/JHXcRdNUL5f6Ii6Sq3Njspf3KdK33FUyi6qNvKniOcZbB/0onFdDxv10ny3t05KIpKeWFEHg7AG8o7NT1FET+sKzXKk3BjOaCP5PdKkHvEeDndFP/mpuohUBhZ1gkfs3mgM/IYgwWECgEgNH5LJ1OrIyOrG+mmmwkCA4p6L7gDmvpY2zFOPeVRZaEXDMCHngLyUqo/VaTNy+1c13KcSewPtHv8MHlapp1SMAUTIr9k0ZBjzo15vAB7j8yfMqtd1vw4BQSJTekbDeaAgcuM4+Fs3g== 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; bh=FTsrzSfpJTq5O9TeeUGTap5lJ8BA8St8A5H3FL7A6LA=; b=I2p9dTg8knlIg9XTASvYsWfH9TvBewAp8EUbUHb7y/ZTEvc15sRfsXelgflruNY60KPzX/mzZCj1yANHUrAuGEsC3AwuQsmYg5wgXve/Nqg8Ioj3dDZUfsUT2g0HRxN2x9zw5H2F16oluJOxEL1dtz5VPllWXXy6sMSKIAn0bZbdaKLM//QCDfXY9w6Y8QLuzBSqt6K9EAUT/fLaXo6TRfsG5KWPhEN/hukLg5TaDSEJozCV4tfeaHqQJZnr1UmdjkJk2AECUfGQ1Wz4cftdxPDqMIIKBF2ahTB3hNusrppzLTdM2CsjXDqTHkY0iCnWpeZ4j5Y1fzk1IgdbyrW3gQ== 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=FTsrzSfpJTq5O9TeeUGTap5lJ8BA8St8A5H3FL7A6LA=; b=QE7xx90hLHPDjeuyhz28ssp1S9btO2GlEWuDZ5t9aRjqQlVGq4+vSxt9jH5BSYxuFmhO4s2FZOHu47nC+wc1Kdx6XK/ybYAvaVWYGkk5CNK0yXLSS82mdHBMAkk1JUiaLKgY+4X06bdDGRIYlR1AP3cSLZwCL+c1yC5DPXJw10Yw+5/8g7IoOL7sl8g9gRdLN4KWfdU49F88ThJ3JBrlISpmaezLxG1bQhNePrzR2eZLwQEgH7DBw62TxHPgf2jYswMluiweB7BMHFmqgpCvfOJW6GIOkHXMr5N7z4pqY6m+9FwTAmW7TWu8BIiaw+fJCJJoV50JzEWm36Z2i0VDvw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:18 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 12:43:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:57 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [SMGMk1gqBCP0xDFnP/cWhZ4wH1AFEIQe] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c89f2f8-5b0f-444b-e154-08d97133e70c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWfiyriVhNa5oktltvv1jUtAGHJ3ADhdf6ctNb2AF7GKHY5t4kuzg82tmtOlgQoTFHG7kSLYh69Z6B5M7PSolGnjhJZRokm+AbxH1mjlvbDoJ0AJNYvf58afpkW1rk6oygKb+TXU2bIdnxWKJQ0Eyf6SWbS3ib30xy3iXXHl2UB/LvmObjTsoOGM52S/oosJsmKKWHzykrCeSM8AmcEnb6g+AWuh0TBn7MbQXVEyJe3KgkDRmOQxHEYMISR9VLKlbinNolNSHFYugswo6WTt59r1ziZ3fbwWHLsE4b4ydKV3V79nVtU2PieBrDLxqzdLrHtOqrrKdZUwpxF1BE0FVhhfmE9ycZ+fkdYoj9q/LLO5QxA0TV+Xmz+NAW/7jY3zkhGHXur9WW8yRNpqCIWKSviTlwrg7tSCFa74z6Ldn2Fa1wUUMG4mWDTYLEhV9GvHAx608hWS+U3jY8xyrQbjvaq1dbcYcFouGm/q64yqS/+LvLNnXwWalbbDEOp65sigwP+DmJC8cLjP2tmnkSOTTy++G9nmWCMMUDkM4jvPhQWav+FAiSia7efYQjMESnmtGQlS39vX3SbagXJ0quszY+6s7CPI1KXIvCDpKtBEn71mQ1F/lXAqwdNsQMqo0mkWpUCP7oIYMGQZmHxnKvEYX5jlMnk8J0BxEO6OXUG81Dg5dw+wwgBjPYHPTksTzEe2wXMC5dGx09LszSpQH6Ic3hbQUHN3QHsJO4= X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WvHHvjQUgkHJmxVIb+fkh1NjIw5umKM5olSm2WbdfdXZaxbWOseilvMF6Rewp+qysT+LkaY6Z9sOZekg9RvIke+vUwaekeOfW6dtgmlnpkaMjyaPKtv+zUAamcEXdma05R86XlYof42TCk6I98KoqTr2R0rTsXvIA8KbCXxgH/A3sa6eAfHqE9mq0LmKEjev0B6o5tcHJESoNhJOkhNumLG+QOScjBuzTQfXLI1L6y2giyLXS6unmCgoq/qt5TDgmSDx7KLMC5gQeYU7FWq9z6R9G2/cjsKbc3td10HM5JdWdOmWAXraAHpKmhJFo5d7a5ebymFnO9/gukDlP1lD7vY5KXzbFDjsfGqPlT6P7nhXVJ83U/Wd2tFzT1e3mJqouVn+sj1vH1oYWeC78YojJtbfyGg6sA772XfP4Lj9EBfkYa2xFXzA2/j0ZI6E82PP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OwTJd0SJRh0UkKWpHL8AeQA2X3ZUMDDBgcQcQVdX4sNFJExgnZaKeoIAjrGJ6g4nuO6ZLTMN8UrstCJ7S7Mf1inJhiu0Ul0Qv8Ibq52dTrFyX5YQn0jSOxUm/QisC06wtNpxJa/LqM4c9c8i01EIWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c89f2f8-5b0f-444b-e154-08d97133e70c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:18.5507 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 07/11] avcodec/snow_dwt: Make ff_snow_(horizont|vertic)al_compose97i 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: NOtuYzZlu3CD Signed-off-by: Andreas Rheinhardt --- libavcodec/snow_dwt.c | 16 ++++++++-------- libavcodec/snow_dwt.h | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/libavcodec/snow_dwt.c b/libavcodec/snow_dwt.c index 25681e7edd..3dca3c6d30 100644 --- a/libavcodec/snow_dwt.c +++ b/libavcodec/snow_dwt.c @@ -462,7 +462,7 @@ static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer, cs->y += 2; } -void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width) +static void snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width) { const int w2 = (width + 1) >> 1; int x; @@ -526,9 +526,9 @@ static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, b1[i] -= (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS; } -void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, - int width) +static void snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, + int width) { int i; @@ -625,9 +625,9 @@ static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, vertical_compose97iH0(b0, b1, b2, width); if (y - 1 < (unsigned)height) - ff_snow_horizontal_compose97i(b0, temp, width); + snow_horizontal_compose97i(b0, temp, width); if (y + 0 < (unsigned)height) - ff_snow_horizontal_compose97i(b1, temp, width); + snow_horizontal_compose97i(b1, temp, width); cs->b0 = b2; cs->b1 = b3; @@ -849,8 +849,8 @@ av_cold void ff_dsputil_init_dwt(MECmpContext *c) av_cold void ff_dwt_init(SnowDWTContext *c) { - c->vertical_compose97i = ff_snow_vertical_compose97i; - c->horizontal_compose97i = ff_snow_horizontal_compose97i; + c->vertical_compose97i = snow_vertical_compose97i; + c->horizontal_compose97i = snow_horizontal_compose97i; c->inner_add_yblock = ff_snow_inner_add_yblock; if (HAVE_MMX) diff --git a/libavcodec/snow_dwt.h b/libavcodec/snow_dwt.h index ee699de35e..390bc57130 100644 --- a/libavcodec/snow_dwt.h +++ b/libavcodec/snow_dwt.h @@ -99,10 +99,6 @@ void ff_slice_buffer_flush(slice_buffer *buf); void ff_slice_buffer_destroy(slice_buffer *buf); IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line); -void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, - int width); -void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width); void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, uint8_t **block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer *sb,