From patchwork Mon May 6 21:52:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48603 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6816:b0:1af:836d:81b3 with SMTP id wr22csp14454pzb; Mon, 6 May 2024 14:53:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVrdyUw6zNkF6IKJOOJjz+e7j/iy6yTeNvOQTh0AmPAmUQZ3MBR2U4BU/yWA915kkonjBD3CtzR6ql/7iVpHcJwQ2+PoCgLwVea8g== X-Google-Smtp-Source: AGHT+IHqSen/g1yOAUNqClog4X0pt+MuHfvWArLCaRW2GkhZ/Z53rUOvg5r1w6gbFE/8ScsnI94E X-Received: by 2002:a17:906:6a20:b0:a59:bbd6:bb38 with SMTP id qw32-20020a1709066a2000b00a59bbd6bb38mr3864867ejc.7.1715032396832; Mon, 06 May 2024 14:53: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 s19-20020a170906061300b00a5741f4b33esi5046606ejb.441.2024.05.06.14.53.16; Mon, 06 May 2024 14:53: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=upXcU2aQ; 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 26CAB68D713; Tue, 7 May 2024 00:53:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2087.outbound.protection.outlook.com [40.92.74.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6AA3D68D713 for ; Tue, 7 May 2024 00:53:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gLkVWUAyGiw6VkXc7chKBFewOEz4tmVyvVH448c8nLRAc9GeFOsbTNdKblCDUBhKN1uP4siK3uOA9h3+HUZgSTorDzjtTtDSM09IRRj/hoXOTa9IOnjkiZDEzes6Vy0cn0ME2/v8vkvwloYyDs7FmOl/Q9uy3k+JgTUrGrD4zuSOXvA+/UPV/CK9bW1AtD3UyCVC4N32XaRWCo+QfeBidf9dGtRhHSG0CM2ZA9nhHtznFmaqOKRg8yRNB4DL/M0cqVKEmP1II+KJ8Bcs29v/XxbYG84Jcgk5uHYHP6MUcKOtiwtHacpcFZ5uk7Jo0Z9gW0aFlCusJTgkQeisiWxZBA== 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=mhpTz6GJwik+x6WQK95EK905VbhvoQMIILXQZFLRpTg=; b=PxvlxUjVZaO6IwhI/x+bOjzi2nLve9fm6bNWFJE9BKFrF7kc/BOKIEsridnAfnXvZNq1F26DUthMy6Vq1Z0iIrOmgXNPER3BkzoaijAHPQdY8jqeFAuB76hTTP0B/sHn1ETbkaSMmghu3YDpiPSdRGDCDWu/TJkuE8DuYeQMOIGPz9ZwbF7C7FJAJg2Oo85yidNgj2CfsyHQ3/42763gPHEvs/vbfNEXudCXRKgqlsEkWLRSxLDMU+oo/GYoseOMEwHJZApy5zC2SXjCgYq9G75KsVTLlNUjbRLTBmNiP+u/vzgf+BTAL9Ii+jCmxM+deqP6oxrCZlkVSHovBnzuvg== 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=mhpTz6GJwik+x6WQK95EK905VbhvoQMIILXQZFLRpTg=; b=upXcU2aQJjkdF2d36YRaqjk8xKqv9M7crhUaapOkPC2jr8wN+51Xr8Gm2PYgoyV2Y6Hk2jBDJN9GMfkRiRLINMhVUfjG3HC+Dcxmb9CPGeEYUgXSiumigpINaXoEmaPNm8VWXXaEm5R9bscxu6tgMW7A7INfuKsFAkc4+qXpbgiZHTv27P3dalsDLjih63ABRY39TyBmMwbP4hr1LRwcIqMnbsoDI1uf2SQsSBEYpxWzA0NLgRrF58NRYwsA7ceTQQwXUG8Ie3PZ43wHswLIIiYSx8+ro6V9jsSEorYF4oEQyEUCtKhIgFkEPSBmlMGoi/RooBjFGvF0AubW1s7iXg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PRAP250MB0592.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Mon, 6 May 2024 21:53:03 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.041; Mon, 6 May 2024 21:53:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 23:52:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [12vv7Bq631rEDcPyBIgPmtIrrm7odixDous9lQyELJo=] X-ClientProxiedBy: ZR0P278CA0042.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240506215227.1260832-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PRAP250MB0592:EE_ X-MS-Office365-Filtering-Correlation-Id: 813e8921-27b8-440d-c82e-08dc6e16e7be X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: lZlfmc97nhxLe8cMXdRO0J6iI64GryYB33zDBU6H7ehRA1AIdwLj+dMcdn8psNdDGxZUqhQ0xJ5D19pwxN46MbYB8CF8GfFfP8dY3U8LP0Q4Sc+iLdtuAiquZ0mI07/j/6sBHPQpFws7/hWIlIOl3apFauqxfXDiahjInl8I01sDSNqrhR7n3OlAYm9yc9hloIjuWg2c36dNUoCXjaUOQZPAC7JBbpF0mY1yhbltKH1ars4TuZdZEe03GbBMTzUBnAtPASlcItB/PcOrzMCfKpluhnqCPK/pU25bI7YVbqyOdLxjpJRTYs7Yk97SPls3JtOauiD4yexAGPKZJXNAPCohWida5R1LB57g54bDc6z2evOaRL7Ib8+9JVnskahFGbEnisBBEsA2AZH8u3kiDqfu89d621oHlhzWxOugS3o8NgYG5FdfNrtCB9VyzRATPoiZVlaf+AACjXmolTRd22jeNubxJnQEos3pFPLgL/hla7qXfJ6ScZcpNfUF6BgdcLEPmC/MYr8jXS1b9EcFdOfSLflKOa5uNAFPi+3t1Ca2Al2GzuFnxQfRktuW0JLn6DVK3VMeok32FlehRHx23gpTkFg21KBfmDoRcspyL4MjoUByO8rNhKOjGVe1XJNr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x2v+LLOauCJHHp487iMZowWLxESOgVPCbng96Zu0xAULvfwzRk6qwDp7aOyahKvm92kG4HHKLvoQ0DYXpOcmLU99MvhUdkOkdHX+myeyX8hIHzwJUhSkNfhQEJqIfp82VxdAMlwC9plizx3viI0W8XwkooqgqxwW5YZwYtCJ+4eNlfm3wbQ9E3q97M3nxpXVuLpkxNzZnRPA+M3eKznnBJMBv6PKZ3hU1FbssyOxqMGZwx9OLPr9qOcJG7k9if25Vk5G8dRJt9vAQI8hgnsSP0CwLtavI1742h8tkUqGuVy1mkzTRhIFzm4+dtYy89l298/0iENCrZN1DusNXNOV1Vpf4NMhXLr0IPEvoC4BB61Z4V0OnqNNvl27gq8/lA6CRMPchzkINoI09U7mCSxbMLltOCaTYwVrEi7MmeNJtsi4vVbGnJDtEraICLdI1ezP77rPbBiAqkPlrRjIpItlBcRlM8dnC7TMn3Idm4GtE6Wac4/Efi0eT+SLbiJB7rTbekwCLiI0aV0P8hxUw9otZ6fky4cpLJp8xcLJtPTkK9UuHJwS95u7YVRGGwW/VbiEFy3mYQzo1HK0QcgAjG33EvguI2kgTkyDjJZyaErel8RnKatWFGqyMJlZxzbR03mibNRRVy6OSdbOdoEnehRoxmOIYY+vUND4dkJht+8hl98p0i2snplbtJGflRBJp323AqVmALyg5num4pp4S/sk0c/HasZhTR/xTPtL8LRGo4Q8+hbtdNWMJzy3OeEcFXPAa8R3iyzzeu1amvIBnuAYBnwOgex2va4OPgZY6pIDw4XS16+ggeUvz/eOgT2D4FjQQjQ3eJoIZVGDc6KfrHRUlLKsJ8JsjDMaMOgPF2WjaZm+rnwvJ5YYtIKZg0ZLsNThs9mQNQtK5oelq5cij2VwZM9lrR567+meh2+JMkZBjXH7+nqzUVpSN7DbVl95DaD8DvW0Y5nnbpa5iSkWrSLRovcTwtQExizQRdNDXk7rtKeM2iV+tIDaWYeNu30fgYr7iqmHftKOrzTUVMJwrFp4JSLGWYRe/DWtgfjMEHtLZ7QG7caaHdOV1sY+X6ck9axKZDZfIibR3X3Nx4j4/niE2XlwYoNoObPQe218Oggifdbk8tQ0dWEaGgaQ0gsp7cq/schwcNPWg3SY0Vj+wZ1nNWjXLAuItPF26cfPFnmiG6Zd8VOIIoiYDys4EPQzIu27YNGrJ5atRwAs7c5ji60yXjRwKPOr5Rwk5ZFZ/cPvxRqCJRHotr4xxf5wnR0NgBHF+A6oDEHorEDaPyYGQ9LNTw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 813e8921-27b8-440d-c82e-08dc6e16e7be X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 21:53:03.8501 (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: PRAP250MB0592 Subject: [FFmpeg-devel] [PATCH 28/28] avcodec/diracdec: Don't use EDGE_WIDTH from mpegpicture.h 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: qIPN4na4M2YJ There is nothing that forces us to use the same value as mpegvideo_enc.c, so define our own constant. Signed-off-by: Andreas Rheinhardt --- libavcodec/diracdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index f0df74e131..df52e56098 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -38,13 +38,14 @@ #include "golomb.h" #include "dirac_arith.h" #include "dirac_vlc.h" -#include "mpegpicture.h" #include "dirac_dwt.h" #include "dirac.h" #include "diractab.h" #include "diracdsp.h" #include "videodsp.h" +#define EDGE_WIDTH 16 + /** * The spec limits this to 3 for frame coding, but in practice can be as high as 6 */