From patchwork Tue Oct 10 01:27:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44217 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp1772675pzb; Mon, 9 Oct 2023 18:41:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxA7bM5y62ElhRHF+8dTkMeiYGR2IHlqMI7+rUv38QT0MF3l6buBcJf519mo1sPDA0POz0 X-Received: by 2002:a17:906:cc0d:b0:9a5:874a:9745 with SMTP id ml13-20020a170906cc0d00b009a5874a9745mr14645591ejb.26.1696902080414; Mon, 09 Oct 2023 18:41:20 -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 v16-20020a1709063bd000b00992a9b11cf2si4831702ejf.787.2023.10.09.18.41.19; Mon, 09 Oct 2023 18:41:20 -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=LpnOhuhW; 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 8C28F68C9C5; Tue, 10 Oct 2023 04:41:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2088.outbound.protection.outlook.com [40.92.89.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A0FF68C79A for ; Tue, 10 Oct 2023 04:41:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W6DSOzE0sN8+RYGq51IK7yyKF58uEKQQjGhRWcATQ0voSI9yN8oml5rQO9+iG+GCxWA9U0ODRxqmM/4NqLp5qmVudGBpfWctvkcGOBQczQoTRTBMwpPS62VFQyab2Mpz7bOlFRkHCRVC1mYoBj+URVLvhdJXEIKjNHqfbFCWQ8HbUZ6fue/8dbNiJ6yns7F3AMNN7mzlb0DOLnidnoFZIa4W7Tvhn+zAE68DM+g8cuwQVLsHyIQhGwPM78U9sRiepp4DpdQ3xT2cup6WymV99s/ordhbO59WaKGoF49f1njAfR9TeBpCX66KRZ/XO3OBEytFf1nzvasz/YboPFwQBw== 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=BiWLDZhuk2B+jzHL0LnF1QvuI0PIlMxoCRWiree0gyA=; b=XuIM6aq/6R3xkeWJZOc+mJe9xSmDLTaBqs8AfnJ5Z2qCv36MLUUjJr23f8Ma5TRjVY2SkodvFhnLHvXiHI4gXFivbVv7Ld3xcDRRwuXsKLr030MUPNs0GgAuCWfgCCZ0o+AecsUW8bxyMKEbst/xTa4xUcvpC192nfUJWW4Iyxythrqt5mVRVjYBleHeqPpbQo+FZEglQ/fF/xviQ5ubuYSqJF34x18u/enAKN30cE5961uoaOpPhkz6kKZLHTMic/1zJcepVYR+rbp84UzZoqnruzByeXoItll5UT+qG+w18XqqUlcFr6JcEFd3cQkXDi09nbPfKQE6o9P1j7MIQQ== 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=BiWLDZhuk2B+jzHL0LnF1QvuI0PIlMxoCRWiree0gyA=; b=LpnOhuhWtuuI4WMhveujH33gDWHYpuAKgsTcX/6kyhSsjP46LaBw5RYgrxzsNkOWCWpn3NnBvZ4qoZPf4QYNMDaUX7ckiyfG9ntS/CpN6ciikglsGSR4PlXMC1QvCLZUpbEQ9zMQAOPGUapd4AJt00Wn7rGBQBObX27GIAYTrO6/urzqWBTPmA5YUVo+kpV96eSDC4hRlzN3GD8uwhQHgVPLyHi+HfCJrX1Ep1amqu0pUp4r/LuC5tgL+L3+yZHfztztv1h3SPqUNL1/SOTeplTVNi6eMHUSUOkrv/1szNosvoeTV7Xz++5y1WPidRAzHYaljt5Poo5Ka1exb1icrA== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PR3P250MB0193.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:178::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.36; Tue, 10 Oct 2023 01:26:12 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::ec5a:5f06:b873:e81b]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::ec5a:5f06:b873:e81b%4]) with mapi id 15.20.6863.032; Tue, 10 Oct 2023 01:26:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Oct 2023 03:27:19 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [GCPO4oRde8JtegZ21NF5hrAQGgHghj+0VQAWOU3CZOs=] X-ClientProxiedBy: FR2P281CA0144.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:98::18) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20231010012720.482970-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PR3P250MB0193:EE_ X-MS-Office365-Filtering-Correlation-Id: 06e78071-f32f-4cfb-afe1-08dbc92fe2ed X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0G7+5MS0Bxs9SUvxjYoOOFxPNcCsk3VsfjNbGUkxraYlAiXQX8ngh9d0VyOuNDRIjPN3cj2gnpNT85uGm561jFezIPTtgMe5nlBSXICMooFVX+c6NIgGIk6CF6jsiJRcUpN/ZIPPsX72mCbbZwiYES1NlQfrq4YbKA/D3LUCLbkrj19OJT0DXtpYo8z7aUpJOjTVHwHo2T9bMtaz4Cyh+3HqUWpM8jNG4oG6TCR6ZO2P7n+8VWpfc1IOBX7yNYkEJornXCiQR0wMv/UTK/ulQqtRepBcZ+212ncX46EFvNQ+B+DUCHCDCOnARoLnmp0V8hQpGO39KQg9bApDwMf2f9tyqiP4r7uIvVaEfiQVpncrQfDBpxpnR3ixL4LsE8OvenzN14IKNQHgTA9gtw/LchN8xuA8ixI0GEZ9tjasctse0fmFYtio5nh90PLrZYMd0NftLyuLRCn6cNme3gaj0Jd0ch14r8yed1Z5u5BK1Z5Oq7cbaJRVdAEyevY2iOXRHBoMRoKVBxLJ7w94LQCnbxanEFoOzOgumn1COEElZpI6WDXIey1nyHzRegOCb3Z/R8yWToZ8GN3IBIPzYcAXMDFkAteaSm8qga4x47qruh17ctuRp4Z3ud+Ioc+ql3+q X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BFpMxbXLYpdSROUboQKhxC+kWV8HZQEzzKPrMU6GMoa+nMdgB66ER8JUWV0h+dxD36dR9/DgMbSfBRtTGvMJ9C/AW9edaRjRkCXlnWfYUp4WFZTagG+IjgXGi5k/1GgtuqlNXEIoyrXPVadSvkAXTRJoAm7KCjp7LhqRpVve2TUGRGOIs31qP1RSsrxmJ4RX7RXpsqMj3DtQ2uAhVsBi2DdzjT3Sg+i/VzuJGsrKoBdnDW5TDGDxYjbmWBgK8zA45JUSqyY9goY1eoBRVIeR5JOgW4xKk8M13K+ctSKKWa41yOcxK3gFMD76uJlWb/r/7mYXGAgEM/tMAhEa4wZql8AZUr6GdfVkKN8bh1XWNU4N5UGM6jIMqfEPmNFKg2DVYI9ID0acokKzEzKGbtdyxyAF/okZg6HrJRWL0gEEgGGd+IwDWdAsvUDe88wP3XKrSUju1WOtCnL5vcBOMNDm4fqiG64N9BpfeSjx2Xd87RuhyARHSMS8T3J8R3d2xtObpzLlBtgyrxMTUY3l4ayVt1pDriEC590rIVk6H+ekA4yfs0HJ0T0y6r6/tfR+d6+VsPl/9ArrZ7drYIm4tt7kC86RShGLhGzFOa+bdJl4reKCakfLTIcUx8BzBJVn8lgSdKWIowujE/rO3isgZ2msjqO5MUowtj/f1m6AkoJUtZLXxyCD++noxGKYG/thJrueJACySpPGJumpE+aXN/49eUx/qt6NigvxTfKxpEaYhDfuJDFoREoqEhn9VKdJf2wVBXdGoFcy/+bXhnWRRuTX2YJNeLoekDzuSUYIxikADLwi/ZKIdd6mmhG/FqPRcV8YWdE+v1rdMSiPSmz5aWWjBDKLIp5E6lYumrcBucyG+Ue7sB80sLntBzBHw/kjmAwG9o1dmrk4BlB/94edbo7JKmfV18rL0xyJ8kVo0w2twzEAfGitsL/b393yrpYWnr8VFstBWaNkxt55v0o7JRLK3nioTm74wYtejt1+I+aj4VwW0HLgRx44BXaWPCfgs5htqHMOVVDFi8S5gq+sb9a132qLNiYdWbNHmoP+M2HxZLvq7/TESiXQKjnUVl24bg1zLyTaZI680UTCD0t3HWBub9BiWUPf33LB2rLe7SdCK4iQaWDzH6OrORP3CfBBDdLfikTeWQyfB61xyWOq7fqbCWquxSIJ+pUlckM4XJor3n1fY5FxDA9Y3Gk1ApoeIK646fU9o8Af4UGv/mkEqTr2KiEwRfIk61roDx5/KmuAvwnpQsrV78xJ1JLtSKRv444D X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06e78071-f32f-4cfb-afe1-08dbc92fe2ed X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2023 01:26:12.1688 (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: PR3P250MB0193 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/error_resilience: Constify ThreadFrame* 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: bkDQkA9j6oJJ Forgotten in 0eb399ac3953da16f880a1e455bb009a45f76d49. While just at it, also use a forward declaration. Signed-off-by: Andreas Rheinhardt --- libavcodec/error_resilience.h | 3 +-- libavcodec/h264dec.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index b03f8ec896..1346639c3c 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -24,7 +24,6 @@ #include "avcodec.h" #include "me_cmp.h" -#include "threadframe.h" ///< current MB is the first after a resync marker #define VP_START 1 @@ -40,7 +39,7 @@ typedef struct ERPicture { AVFrame *f; - ThreadFrame *tf; + const struct ThreadFrame *tf; // it is the caller's responsibility to allocate these buffers int16_t (*motion_val[2])[2]; diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index b4ea0ed880..0009b539e7 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -43,6 +43,7 @@ #include "h264qpel.h" #include "h274.h" #include "mpegutils.h" +#include "threadframe.h" #include "videodsp.h" #define H264_MAX_PICTURE_COUNT 36