From patchwork Mon Nov 7 01:49:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39220 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1848952pzb; Sun, 6 Nov 2022 17:49:27 -0800 (PST) X-Google-Smtp-Source: AMsMyM5UAbZyDxmSkgS0+5iO4fJeBguy0yCiN9SKG+45tf2cf0stbZq+IsvH8P/686soDlBmQdUh X-Received: by 2002:a05:6402:5248:b0:461:f0fa:864e with SMTP id t8-20020a056402524800b00461f0fa864emr46544974edd.81.1667785766885; Sun, 06 Nov 2022 17:49:26 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bw1-20020a170906c1c100b007833cbbb747si6306224ejb.578.2022.11.06.17.49.25; Sun, 06 Nov 2022 17:49:26 -0800 (PST) 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=DJvFNI9E; 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 A3D92689CE2; Mon, 7 Nov 2022 03:49:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066087.outbound.protection.outlook.com [40.92.66.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9CB0689CE2 for ; Mon, 7 Nov 2022 03:49:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nvwAYKJS9NDK0OJ3cdBDDWoOiR/FMR3HEUK8jrgWYgf4Hx5ui20wSeuAAy+oqEZV1R3aj+zNQuSz73uvhb95uS2WAs8gJZSqYVh2mC5B66TCKH6nS+Ulz2lL8AoukfgqytVIhMf16z+WcGeuDJ32CNRTk0PN80jf17JRtBUnkns3sjKRR1C1QShLhKkfy7ovNUby2D3qoDGB3RU+Y4qlkVm7GUFeuqYi9E3Y4HjpEIXflvo4WlY3Wjiq9JouvitvjMew631exZawknWT38SGEOUy5TMW/jhrJQSSGZ3E+tQVvmCZ47ZymOH2tuHzmlFrHrUOe4cydAeZMWdlwQv/xg== 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=/EA/rxCn8TrDv6NAnPMbreziyDvvnsW6aEKtDLkqlNY=; b=GzzU1sqQSwivLP4jsTwHGTOIPU+ZKqZyj5bUMOhDIMYFLCtr3uSNKHx5lPJH4srMddmZ+mVBiFvnWr17u0Ibcr7w3VI+qaGTg5v9BW7S7AzI0xE01qib3zVg6FTPSzWwv6juK/vyD5ndSOzxQR/8mwx+gwk8RSSg7GsDdvbpv3kzSWzDo2bXju7IoEjc3DBHZWyct5i2tV/50MJ8neceQE6u/OfuSoNv6wSfJnlDIm4jDL+8U/EiWpD73mDJ2HEsy3/rHMGv/R+/vA2myx55U61WDVm6FfLsPZlQvPG1AjHEYmbK5ES7SByQqm7rqee0B0/C80Ogkivu2QBIj69JLg== 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=/EA/rxCn8TrDv6NAnPMbreziyDvvnsW6aEKtDLkqlNY=; b=DJvFNI9EpX0y0XFMnAslKQdEdbfLKDEbtCd3c8Sy4CCrJc2/TCGKRWznlSr/bP5rY6MvbRyoJ4yvwvTU/ohGrDk/pyio9KtHJuCbqGl45faysB1WUBLo3MAZn7pU9rZuzl9CcYYUQk7owHwnIC+QgxzDtl1k5spXWCPSErfgtfigo2I1iCdexGG7u2mL1Xj6PPRZw/bixxRyuTnyG1sN0vcrCpxhjC8ExJrIWeajyirysJsFeslQXcehHXScZSOKrPODhwHbMmxffGUUesIQldV986C9QIg0nJ1VrTTB8F3BM72AIuKMP+xLBBMWmQDZmWZ0FbQchQmEgIRCFe7R6A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV2P250MB0923.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:7a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25; Mon, 7 Nov 2022 01:49:16 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 01:49:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Nov 2022 02:49:19 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [TK7pAefp0xImY2LakO3X7amfOelgKqOZAt0Gsi2zSVY=] X-ClientProxiedBy: FR0P281CA0009.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221107014922.1503434-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV2P250MB0923:EE_ X-MS-Office365-Filtering-Correlation-Id: 0ec4f022-d4c0-437a-bd05-08dac062476b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqxUC2t/XAH2K/2kJg/kN5ybze9213Rdg9o40MSu55nFAq5q0LSaYPxSyiRYVxUwLTf+coYwSXh7ONzpMqsBiq9EMDhuAwdtGbi1+emTW5d5gBhm4SUdLGKDNYSeRV1wFCdKTRTdLFTU83JSS97xKvxqOEBrtAWZ8iBMgyNi9vIhWnYEjbCKl75pJAz7f8H4OjQCN/H3hXTEoUZ3hgg/iBZ29f46qS0s/MAGn31JIPgiIg+IAd5rkNxGdm+bydD7vn8h7XsJ1JwW/Q0isfpT9dDg2Hdn/uI4A6o1ijzbNbMNEgm6Qu3BwbrrfwkSaQlRLvLZLORVf3kcuATpMyommfklM0H8OsZ+29nToyPVXt+KblC7HUt+pF7uuo91GyZg1Nc8PSzVTprYsIIoDQUX95MB+ca5Lmol7SerThMU3sq9kvcsAQb9FgNiRcZ8Tc0I+CPXXR1sKXnwFsbJ+BzImQFiC2YoA+dly0CE6N/w73PA0RFuUKVeFKv1EgISTaLlkZ2V60soXKAzsWFllIJxZYe97rnh2Fjy+2tYZES2276RHSlFrlA36l0tN6UxCQ7qq6HGNOwZvxNpUYU2ZxUac1r75SbS/WNUuhO2/nBETJb5YbN/KOUy7Z1ga0mnrnJt0eRLQMwY0e6jJ2MYwqs+gZ6s/w3rxkIIfnDUIuZlIp/6y404Qd4mHAVVZRB/+AhNyzuK6EF4HqbHWvD6Awm1dJPMvESKPrnmW6cKtaxWgDNfESSZzP6T63VPbu2eyv3WzU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dqv1BnjOlsHLyh8McwOcdj1O7/zW5Q7MnUeQFExRlNwbY2+grCZ+EqU4RyL+bx9K7wV8vI8I8OI2ldYE9HQ3v37/ytleSWoX1ifAo2FitrbQqmke7yNceR+kQOPNh5k0H8ynkihw9eqaQWxRCNwUSRWdqi4UQcE9rARzhPEOvlPxRjcXqHAMHSKr4Fr/CdihPpBTIhssrKxqlH0hVen91Ug47BIZbeRAfEAhSixG0jQDjKLnR8qvdv3UKBm31L/k3F887UKhve21Ys61g53gzNiR/ULHptpuRh2UybkrngtjgM+wkIwf6u9uIxV82bStetFbl4EEbpR/LfEj1oM7xm2BhNGiGJkiFb9soReaPRyHzGgJZKwbUOw90KtRM8DYhx7p99I9TCuk0X1Hrf847+bCdhFiWq/X4lH8MMH9L4Id5NYeET+1r2INfa30bRa85JqfC5/Zaompfv65ElMoTkv10cn4HASbY/n+CpFrdnovgpk2Kn5mRymWHhMaNQBH+Ww4mlatP8tKJy7SD6EP9g6PYjYejHrL5/XKVgVxyRHr2PZgdwtb6AQFmarLcYihAIrgKA+4DCmf5L0AvUoLTx4ghejECvYezPl9MQ9N95sOQWjs3zUo5PnRum7IaU8ZVdrXdGS2Ii7J+DTovt2zuk8SnPdaCy7YBKq0w9k4poUu6ocbVccV2YCW2pMYGHzK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IqAxAkscv/VUEMlIlusNK/7r/xsbQTg5FHjFc6DyskyguAidA4pFmEVydOG+2LzilJH3XWM1HVt77UGJ3GZuQHpICWypYgAoeVxULmEru41dpEC0lGSHk/b0QcXnLwuUXdJGrbMc7PmIlNkaaV7vVW44BiJGa4i4yfrO1Z8akluigWjPVdpUROP07SJlYc6/VfTUgGEcRRUqTP2ZWCaky0IgGkjYAT3QR4OkNpwz74K2i3lZBtCqLCGDDkDG2Km5POL7HYNFcE4wV++5wyWiYQ6dYlHz/uX72ptyVefybJTrWJJIaD2AXGI6XwYgyWS7vnqgiR3ZQ5ve1X1hpfdFaF5surEDig1LWim7uye2EGtl7mG4vAOiNbm2DsBA1boSrO6qYcHH+yLr/dxmGkXZzIohC/ThHQtRJgCgLFtJyh71WvV8DpiKOE7cMoRVD40C/BqKvl/mjmAttNw4NSkDOYDOIufSuAhqdOE8KSfp1zS5bvH0OVRIPEnlNAyZJ8I4U/Nr3SlMRp4kp40R1CizsrntI0abc3WF/4oMJaROsoUeq5z/RoyApb0YYlr39J0rtPHbv3eXUozYc5cj8xeRHfIfMocDHY//sWoNP9MTfdmeJnIRH/YuYq7DWClRW4Re04+i5oPtCzBnwpERT7hSJUyRvy14X3QGDg7bJra/0bgcwMnSDk85a4lTVyx1li0vR08XRdZhnRwNhXKnSbBkKkGc4Z45yxWlQXlj/L9w7Iqb3QEJjrVqw+c22UYBr+3W5Z9d+eTuj99Eb8+uIbIwi41wJ4n6G8US556gfJFxMm2JUbI1UuLLAz2KsvxPC0qt21p6LJlp3ZrKs24xMRN83Mk0uBVlMRI9IGIwjK+gxc7tDHqLpdvkAlgOw0dqbE8rY22bFORwmxB2S5rZ5kpVWZKPWEESVF6YMcFLMOsE3I5hrOjZ9oOs7CDUsEKE/MtbTPeix8wRBK+2qB31NNTaL+t4PbKHnGsHJm2fhrENcQ8nkGftJo/DROdywo+d+QI1N0P9aXWP/u8mf/UQa09XnlrUU+m6iczJXbpmBpe/MexI0/qgKyHMgQ3XWo+B+rEd03H6qF/OT9Q4Ad+6m1Hm1n4/VszybCg9WCzX4yMF41frlB7/gL2u0Lxp8WMd5sGYXa3+znjMGT7SLQncUvkC94Ku9GuE+G8VTISDdVzjvbtEYG2zQsdI6kyzNRvIL4PCjL5u/+HBUnGE+dFNeJY2tSu9h52sFBx9oAcU7jhQQqhUcRQ4sAmYw7os7bi6Q+OHm37wRccfbJ77rZ+vcWCQCSLoSk8FPxyg5IolbfhPcsdnkUfzxVqh3yUGdsNCsnD2 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ec4f022-d4c0-437a-bd05-08dac062476b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 01:49:16.5635 (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: GV2P250MB0923 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/clearvideo: Move tile_do_block() upwards 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: QGWUndBWHMTN Will avoid a forward-declaration later. Signed-off-by: Andreas Rheinhardt --- libavcodec/clearvideo.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 82311bc645..6ea3d7b6a2 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -362,6 +362,20 @@ static void mvi_update_row(MVInfo *mvi) } } +static int tile_do_block(AVCodecContext *avctx, AVFrame *dst, AVFrame *src, + int plane, int x, int y, int dx, int dy, int size, int bias) +{ + int ret; + + if (!bias) { + ret = copy_block(avctx, dst, src, plane, x, y, dx, dy, size); + } else { + ret = copyadd_block(avctx, dst, src, plane, x, y, dx, dy, size, bias); + } + + return ret; +} + static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc) { TileInfo *ti; @@ -414,20 +428,6 @@ static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc) return ti; } -static int tile_do_block(AVCodecContext *avctx, AVFrame *dst, AVFrame *src, - int plane, int x, int y, int dx, int dy, int size, int bias) -{ - int ret; - - if (!bias) { - ret = copy_block(avctx, dst, src, plane, x, y, dx, dy, size); - } else { - ret = copyadd_block(avctx, dst, src, plane, x, y, dx, dy, size, bias); - } - - return ret; -} - static int restore_tree(AVCodecContext *avctx, AVFrame *dst, AVFrame *src, int plane, int x, int y, int size, TileInfo *tile, MV root_mv)