From patchwork Mon Jun 10 05:37:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2309327vqo; Sun, 9 Jun 2024 22:37:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWkYSdYGh+p/EOOqzdbcMwDQhgx1qr12Qek+WTZGU97ixbQVZILCMGvJvZzIbML2K5DCQyXjDiy9iOU+16Z3sIRvwqFvSD20b9IWg== X-Google-Smtp-Source: AGHT+IHj2E+M3vDp5f5Epyr9g95ZMK9yR6BrOGCvLKMagbKWfwnQa/s8FAF1rFbPL92lRqGGOPD0 X-Received: by 2002:a50:f695:0:b0:57c:612e:6ded with SMTP id 4fb4d7f45d1cf-57c612e6ec9mr3858387a12.0.1717997845079; Sun, 09 Jun 2024 22:37:25 -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 4fb4d7f45d1cf-57c60ea47fesi2833182a12.534.2024.06.09.22.37.24; Sun, 09 Jun 2024 22:37:25 -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=Gu9a0dH7; 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 9216868CCB1; Mon, 10 Jun 2024 08:37:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2072.outbound.protection.outlook.com [40.92.48.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F250C68D5B2 for ; Mon, 10 Jun 2024 08:37:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VkZTpPv2558+kTzG1voOovJ5ERumak7vfb8WA67VAlIPCWVGwjcSWkIz7mGVQs8ANY2nnokWp+sxW6yi3KKxx9QBcjHbWjPdX6tqdaMGbtBwfr/yWpZ1ii/Q02nuWQqM3q2gPCDq4vCjnytz/3B3pygczeUhIGSIpVL28cN+JVg/GSBf5di8/r+S5Dmot9ulaPLwPH58sld7ip/lHRHqTRhoucU0gZ3gtoRcQRI8AR7bBHkJZj1FPzs1FOIamar37B40w+Q8rUKvp7i8tUGOqha90VA2G53ZcoqbmOUeOiZS7fcy/QyotkiAPeilDD+NFVUNVp/vRGzOqY2r2aIZ0w== 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=04OHLax5uApXaTUKhwsOPmoEcWnAfhMmasQ95bdPS6s=; b=RDbeM4GqoutquWQWwatmfrgeI/6oZkXBOECye9DUGxupYj48hnkv2CPX/YM+051qTbwnimQ04Brz41nbkmXLE2ZVcVne0h54ZHcNrgfS8daiyT/z9lcxdsu9ZFjm8LUr3GkqrDC2JCG93Uydkkv6Wbd/WXYsv7r5L+4yiw2+WIP9zS2dT1EdfWgScvh258NO9l84JnYc9PDHvzDkTpmcXqwHqnU7u5rsyeH7g8eqdu1jVVPjWrWipMAYRW8kwLt8xycEN9BBOEmWwvnSkj7BhWgpQKEuzO7KNkSz1qF5vAXwfsRfRXXU6dgpOsvOPiIhvtCSC/De/3HRJMf/KoHQog== 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=04OHLax5uApXaTUKhwsOPmoEcWnAfhMmasQ95bdPS6s=; b=Gu9a0dH7qn1tCpAiKE5x5bFJvIvwE0UVLnJ/Lrc3TvPHBWqjc10Ch+UX8dyzdY15FYnWwQHN00okF28xtzaW3F9sHmMpHoe8PqKWLbV+Imma0gZKwtD9K5d0O41cynwccCS1NIKbtuKXip52t+aqBjms4WyQeIzoQ8zjv2iHSWjTuqJYzAwA4HywUZQMZ106N5RCHOJZ7N4tuDuvlUL2kvMeoKXXQR+1zQJt/LCbwlTfQqhVxZakP/p9/XeqwsL8nSzGk87oyEcCQFWP028AV9gW765bOer1/HY21/1mouYidiOOP3BwPzYroyu+9tdBpKnDRDZZ8m0mZwkDyWqPew== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0578.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Mon, 10 Jun 2024 05:37:10 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7633.036; Mon, 10 Jun 2024 05:37:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jun 2024 07:37:02 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [Zmum/9F3jDu81FnoPSxs6c1+hYYd5jEVm3R+xm8paqk=] X-ClientProxiedBy: FR4P281CA0213.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e4::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240610053702.3573206-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0578:EE_ X-MS-Office365-Filtering-Correlation-Id: 75f4bcb7-f171-483c-45f5-08dc890f5f3d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: BB12KZKfX1UTL2hfHFlg3n41LYtwgun6Re18bNBu/7nro7e7jP/vNla7sV7PIrKAX7n0bfGraZuZ+vqZlfmRDV+dDC0G10kv/ir23q1TT8I9DQPdhjZvQ1BgqW1TxJB/zSifDOLKqLAHXq9pV11Rv8ICo/HQ/AHBwKhi9sf+wty9g/ZS41Ed/szUUJnVLxtHc5P7swM3zVnYI00ouRSEOwW/FmEhgiicaQVC9n8VwS7rVdqpds1sD/JyvmrXPdYp+cryGBk4i5dDdxwT8sV9auKc52x5fREJJl/w1qukKy6PlXc2naiIS3zw9s30pLZdzD7/VGW739Fi+eNA0G1OQnAN9XgH89V1OSRerWpJUn9hTpSjmUUHuXrSt487Q0jeu6tmKtOhvphV526pTr+POpGgG2wgimSia5QpWoRHONVuqx8uUkE36eNSCxz8HIX7IYFmErsJ+dQzP98O/Rz/6rE+w/7PTNFNIe8XHhI5p4AekYbI656bVUp8cP3QQsi8nGMpJbijdhgdqy3Ih5r0BwEPnCB/k0znQYlXT7uFS+GbXyYWrQ3PKM9DlhPeVsczLY6l3D/OhVzHB3oJ/VTTRw5j+Tgv6R/kdmjc1AncopCrJPVtqDtudI/E1ZL9tniQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kPfiNfIumOGiFXWpx0zf3QqjOM42VU6tsMV27EfOhnR7EzC+4XlXX9szqWeFg8HAHjhaY3BlE9tOplnxU/bzD3Pb+4S0xon6vSGmugIZRyNkosT8wOaZeByQ0XdOfbg6ai3U1i1If2bS+H++7xJfxtN7RRrWRQ+6iCPSOzsyFPty72Qj/XTbaTAhJemHfO2Bb8pocqjRC+k9yMIQwVCHKMBz5w4P7WEjprjcwTiEbbTMGmTgRumuFFeqcMJzH5ZTLqXf1fxC4i1qcQAlDk7PX2t2p2FFPFS3yC9c+vcFmWMuTVyRg1oJTgh07KF+sM7Tk933HCw9/gsJFI2Bk+W/HXRK0Zn2fGmA+ple89QfSF+4KGp4WdYXyFw/JOFbPRrxxhO+Lv1HbKUetmcNvPIw3Bu051LZJE6VGn9LAG8F/gvYK9AyWPDiz5RdPdxdKdjNb4b/60CbmUx7eGVZN8TMF1fTUAyZEwVQbm2HLxhBoAR1O/TTcmV41Uwu8/E2whlo7jPUCCvVhV9djjGIbJ39utRRkJlP+futMp1ijcgsz8ViXk+pZ8CDaLbzasFnOtF9YvzbgYyngDk1KBafYfC5vKY2Xi5kNtyvF3s8mhCgP+19GfY6w2LSGV/LU0nefC7GDVj+yEu4ucJLQ8cKNX0byR1Qm8RhTV3cHiyq6TdCCzjjeaLsivShEiS8aYSsGYvPeD+J0gWECN0a7h87cSXD9MLjCGnQiaGJePUlH79O5pdITZaI5qOkHyHDtl3K3u9guIRH2mNBgI58ijAdQYZez+flAvY5E32P1I9ilw6nU7iar25Gfw4u8Walh3+GcHgnShPMMv5zzy1JmJihNAKnzlhL0jcc3U64Jeo1z9hpPs2u7Wj2NM4ykEsi9dbGR9KiAY7tdmFAcAydPVQiYGYpAipX2nI56aFtH4wDxfw2A2iZa5/m7QpwCkn7hrGf5blzojLE0rafqxilqVbQRj0p1Lc20r50Ic8YRF0yCUgLzG8Qb4OT23JFmr9nXbIrgp/6znQTqbKZ8iaQ+X33b2J88SQCuTy5N6BSg4rQsA3lVQMeDluwVHu5AIctFKmwNx/TXBjIE+7VJw39s9TOsT84bacch2GkE5fgM04gFlu75MHiwZHkITGlxerv/pqgS4lfUuGJUYqrx1NsnpIWZxZ43zIs6vPo0z5GJd9f3fPfToOMCbnDILEU7+cCd3ToTfVTStyMnyCi2FHc8XoQel5rYVB5q4IeeRBFeMIn4sJbdqcnq1fwJ7Yoljxb8dWt9aegQ9wNJgmbdvJFzgpPb2vKMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75f4bcb7-f171-483c-45f5-08dc890f5f3d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2024 05:37:09.8710 (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: DU0P250MB0578 Subject: [FFmpeg-devel] [PATCH] avcodec/vvc/inter: Don't return void 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: 4uweqDo8POPz Returning a void is not allowed by the spec. Just return instead. Signed-off-by: Andreas Rheinhardt --- libavcodec/vvc/inter.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c index 98cb43322f..aaf3230c1e 100644 --- a/libavcodec/vvc/inter.c +++ b/libavcodec/vvc/inter.c @@ -146,18 +146,21 @@ static void emulated_edge(const VVCLocalContext *lc, uint8_t *dst, subpic_get_rect(&subpic, src_frame, subpic_idx, is_chroma); if (!wrap_enabled || (dmvr_left >= 0 && dmvr_right <= pic_width)) { - return emulated_edge_no_wrap(lc, dst, src, src_stride, + emulated_edge_no_wrap(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip); + return; } if (dmvr_right <= 0) { sb_wrap(&sb, wrap); - return emulated_edge_no_wrap(lc, dst, src, src_stride, + emulated_edge_no_wrap(lc, dst, src, src_stride, x_off + wrap, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip); + return; } if (dmvr_left >= pic_width) { sb_wrap(&sb, -wrap); - return emulated_edge_no_wrap(lc, dst, src, src_stride, + emulated_edge_no_wrap(lc, dst, src, src_stride, x_off - wrap, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip); + return; } block_w += extra;