From patchwork Tue Jul 26 22:07:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36969 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp232092pzb; Wed, 27 Jul 2022 02:30:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1suaC75PqQkYZ+k7/MVlDYgdGYS3ZLsueRJR06qR5GkNfzrE+ke6WZXRMlggfWfRJuq8GSn X-Received: by 2002:a05:6402:51ca:b0:43a:df65:d180 with SMTP id r10-20020a05640251ca00b0043adf65d180mr22185987edd.255.1658914247494; Wed, 27 Jul 2022 02:30:47 -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 n20-20020a170906701400b0072f7debe7d3si11047821ejj.352.2022.07.27.02.30.46; Wed, 27 Jul 2022 02:30:47 -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="I2FYyO/R"; 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 47BDF68B800; Wed, 27 Jul 2022 12:30:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073045.outbound.protection.outlook.com [40.92.73.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7B7768B616 for ; Wed, 27 Jul 2022 12:30:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XXPzwTTSamxdHx161K0HFB1I8FLLrsrPLfeFcXWRddVfgexBsUYfh4ATHhBgyHbSCdNbF7KDH1/tnFr8Hs4e/wpd5Ax0iK1kFlLonGgK+aaa7poFYqzr11t7P0islnqoxt4hjja8xXr7SHdMvo48ZhI4is1qzaL7iYBo5XKUyHP5eA81xw2k0PzqEXweA9yznZRMbQNNb4IrkNZmtS4DjZbOUOYVGPFlVRkl+W5LSkMScaXB9RlL2V8UvgpLZxYakNFzVO9mWa9tQXTJvyQybjXEE2Kg7zR9W2LRFiwSLksMdIRC7wJg376E6jCj9gmDu8WmJlsr/cPHzzu2S9Kx2Q== 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=n5Zs1zEfCIr1bOuSBizpgFc7aLL7UOjSwDSuI9bINaI=; b=EQwBoRqXC2fO8PS3Sh6AP6TRHihAs7L1kViucpNWX+ssCbrMJ9MPhJuosgs13zdhzc06UMpmHAwlht9H3E9DsWYi6GNhRovCFq1nWLO+jMOfGKjPIjW2PTZNO/WfJ4fBgaPMBJFOsRewkOQ12siklBAkzaReKYed3459gPJY26PMV/qlsclHFvx7Ax4xH9IusRImn/tlhsVxjGUG3N886GeemUlbPWVf+EK/BIhY+aINl5cRVeaebRMKCgAq3fvEMTFqTvfruBY9T3x0/87yn6MFeAafbyZwwqpWGZzG8WXHsuZrgyhd3gmW4Wuo1RHphhpirLeTWXcbkkkeboCERw== 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=n5Zs1zEfCIr1bOuSBizpgFc7aLL7UOjSwDSuI9bINaI=; b=I2FYyO/RWOWY5V4lBAMxOxsmUgFdNmwaZHfziRlB1V5HwrkpxXFWdKIsgjb1ijCZq2qxkPMWzJUFNH9npRzTWKv//MdMwBXPXsvBWXEZ5uP6PeowCutoIuXT0n/3eeppPN0D4K9mxJ/WIuYTg6Yt6F9TRXRKjDsRqYZ2517AO9SMQrsW0ip9HfAahkusT8Li6T5k2Kuu3qz1nA9cd5ntDf2E84GRv4O9kCUW+QFdyUJq3RxZAOyDrmhFzWkcOeqycU/7P8M1ru8Ehnvy2z+6AD5PFztMKX4PwuUWvONLXim41pqE/iDHMtNxoNYGg4BOVSH/UeKYX9Undf2uWPh43Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB4626.eurprd01.prod.exchangelabs.com (2603:10a6:208:eb::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 22:08:25 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5458.025; Tue, 26 Jul 2022 22:08:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:07:38 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [WCTkYwYR8BvDVoxa48b4w2j7K4y9/Gcm] X-ClientProxiedBy: FR3P281CA0157.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220726220814.695563-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c8c5e3f-c5d3-4880-a148-08da6f535ca5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVFHiteK4sjkXoIVF2tzJUY5ttuuuj1VR/QRiIFuZZpFaCK/HcIG7TEDPokokVd+LqnK32WcpqV2hZ39VLq+tbTmMMNadSIcYOt8YnY7QWxjwiWE1RLRX8ZCxY2BSqPtvqY0OFlhwyvsva6ti9VNbfTUVYgjJ+86Kx/xweAUk3u2jKreCTMxBN6ZVyYyLZNJgiHjt39SOjE7aTyOvRMbW6CkCNmktmArKllbT/Tw368MRpDLBcNfcWeFJDEhB2OtNHPIv+MXmn3jC6z6cdLiOz93jFYSkmXvzD71N82Z6rUbFSDguAlDarFMbfi0CRc0MnTb3EnOkfdxXCMVDwx7mpKH2X2g4pGae52fxvpjS88zbxNbt6StqbJ1mx0iab1dCg4yFubranDU1SktsKfvHwRb0Ptdtk1/WbBS4f7cCMfkeGtmhkmzD8qe9yhpmdOx/jjq9fUAlMUh2t+uM9sYWqwJ5DVmB5ddbPab1cAxEvgdRL5KjDoddvCAYfKrBqPDH9UwBg6oDjQFRcT+aTNvFBptYNQFPZkgyEeutO5qzzFGfMbp6ud6UmNR+qLGaH3qzKLUt3gY2GaH+rkU63ofHeTp4g0Fjq+u3jWdTjf5QOQl3yNNaZs7UX/dKkCPMqFCKzFHXRnZk7e2ZUX4LZV393p4pGQ777rOhdZ72kVYUTlAyqY8IoFLaySekrBIunUl9X7PxdkIABAnYR6Gmp6sr7jdLLmLs9xmIw= X-MS-TrafficTypeDiagnostic: AM0PR01MB4626:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WH8xwPo7JGjG10F1Oew1UbOZ2ILdH1myYB70zoLsvVuo97b8fhwaMi3203SPV0GKYJUk9HjLyL9w2Hqh1d6al7ad35K4KCF/dZwoo0pKSroQ6urvj6YM6xPWttqE8PCFqHyG9T+SgyOldJEgKniJh4K6mn1VYCSFGx1cWHXSSPbWCzZ5JtVaE87shWhyE1/Gh4SLo0Kua+KQA29VsvkLVn5fvcZUJO5xrnbVgLX16jFqM8+lc07WfXXThDeBLj+sH8Iozyx7dtx7PPDcKAAqci2QXRX+1j0zhMaBG4J3m7MolwzUDmfvT7S0y1XPZAhelxsUOEoDV4Qxrn2IhY4DHHBDCCG5iKplR+uOQRVVq1eXvdz3M6oLFtRMc/fhAcz9jEzC2kiMXeeEo1h251XgbVNoGZ5Cq6rtREuK9q2f7ESnxMvm+aa1PVWShlTbgtMKdUjfFB0DnlpWQGb2wkwgOrrCFu2hXwfctXK7EdBEktxRRllNq7Fzl+iuI/GXf7swU/4o4gukVd4S5bIzd/XVkh76nXElHoewYngsgII6oiiNCZFDGRyugXCts7dTf1yuHnlgZJJPgYvEWtl1Da2K9j7huejLOIJWXvNB9phXAVO90FEZVjGxBKC62bWxzEG9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: d3iRh4kij3xciMGK79CoHTTo096JUpRX3fYhVzX8urh7Rzu5RSxxP/1SRE2UdJojwYUyGwRd4/U6/EXLuPRSJutvfAcMDidtXKuftjZeV1NW6EWlv6QjLUAYmeNHri6NWkXAWZ63QoOWL7Q3LOWGuSfXKf2n040zQ4votnsssqmQ2Xv+Jk9Fm8O43PNY5MAaK8uYHAfYouGkUW3bhRogg6NfWQuMCyAFuNZVkjLelWfO1n9dUHB8zhKnBb1BCmmfPB5xC5wa49Hn0lUEC9V2n7ZW799rSn9bH9wl4bgm9RZ7s56wvHX7HCTQNNiSY7IDp+3QEhQZ1TJ27b0U53iwJMbfRbYLPqoXOpV9vte4zIrVAcO4nY7qdhpCU3FSoELQrDwA0N4z3hvdFa6G7C4xYKoPrI/6GvYNxbwEy7LBkggMTnD5sd/uka56LTofHzZ0IY4X6+EEqqOfjlFhNZlbATiXocd5B074CtR3an/lBrr8Z5TOijtKKqP6SDrwQoYYGvFzkyPQMEDwsJ/7UnSdPrqtKjppvzE2w4IwGdXDRPyrBmHSDu1RjNW972TnvHRFDGPtdgpQBelbOZ8IYDRTuWe3p1tT3eFjRop0P604jz94fKnLp6N/T8Sn6ZlRC+dTVSTUih1eeqXD7K0JJuLzbMA4FAsA8EozoPT/gUGjIkcHhA25J+e+5qtSRBCZx9hQT0AkFn2LNGEwZuN3YlMgDPwnOGwcfgOikTYOfA+smwb/1RKqDo9p8aSOtU//p2dz9rPVxruntycNzcHEGWn9wbgvk4HxN5/cN+gF2WpyUEFaBo4qTCG38t6fAsQw4AOz/vCJ1aYMjwuje+rmMJQ3ppJ7xvzaUIxMjRmvRhR1ina9vKiZKGUB2Dm4vpDUxD94zQzK0FF05Ehk1uSifdpqR/YXcsFG7Emb9dGw01icrYzxVP1xyVVnc+AN7932sDICZEGj9f4Lt/HvI2ve/JUnTToRtRmvLozQ5GS3eGY1gbh5tk3qtgqawY++DToC81U05FZodfGIbtd3y0iQt1vB56z6sm9ByI1C34IfvYM2lOA3vjfXhA+lOnrA2TQvFC92Snb4oNPExW+6Oner4AyepWwZgrkFikrnYwe/Z5LdgXx6ixvobD4+7+8tR5dbaIqfI4IrauzxILq5WVO5AVIXNi91aaQsbkW6a4t+hxCg5Q5u2KEK222+pTwEj/IXfJ5vlIxXz9XLaLe7xar29s9YDoyxJkdVa8gteAUzlTU4PGSE6cDLfxAfgt1sY3MGOjyOxE+gCaJAnbRUCuYMfhD4xpUVvKFhk38c+ZGlRNlRbMg= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c8c5e3f-c5d3-4880-a148-08da6f535ca5 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 22:08:25.6486 (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: AM0PR01MB4626 Subject: [FFmpeg-devel] [PATCH 03/39] avcodec/threadframe: Constify the frame in ff_thread_await_progress 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: +dlV1EnSr+RD It is safe to call it on a const ThreadFrame*. Signed-off-by: Andreas Rheinhardt --- libavcodec/pthread_frame.c | 2 +- libavcodec/threadframe.h | 2 +- libavcodec/utils.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 8faea75a49..a54d16fee4 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -615,7 +615,7 @@ void ff_thread_report_progress(ThreadFrame *f, int n, int field) pthread_mutex_unlock(&p->progress_mutex); } -void ff_thread_await_progress(ThreadFrame *f, int n, int field) +void ff_thread_await_progress(const ThreadFrame *f, int n, int field) { PerThreadContext *p; atomic_int *progress = f->progress ? (atomic_int*)f->progress->data : NULL; diff --git a/libavcodec/threadframe.h b/libavcodec/threadframe.h index dea4dadc6d..100e068e06 100644 --- a/libavcodec/threadframe.h +++ b/libavcodec/threadframe.h @@ -56,7 +56,7 @@ void ff_thread_report_progress(ThreadFrame *f, int progress, int field); * @param field The field being referenced, for field-picture codecs. * 0 for top field or frame pictures, 1 for bottom field. */ -void ff_thread_await_progress(ThreadFrame *f, int progress, int field); +void ff_thread_await_progress(const ThreadFrame *f, int progress, int field); /** * Wrapper around ff_get_buffer() for frame-multithreaded codecs. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index cae61d80ff..e73e3a7d08 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -949,7 +949,7 @@ void ff_thread_report_progress(ThreadFrame *f, int progress, int field) { } -void ff_thread_await_progress(ThreadFrame *f, int progress, int field) +void ff_thread_await_progress(const ThreadFrame *f, int progress, int field) { }