From patchwork Thu Sep 7 01:05:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43626 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp298069pzh; Wed, 6 Sep 2023 18:07:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJj6+xci4nLkiUCOGgA2I/indWK6IBx1To6T9TqgANEolfHOFHJuNNv7fCiiQy2mgfXlCu X-Received: by 2002:a17:906:18aa:b0:99d:6b3c:3d40 with SMTP id c10-20020a17090618aa00b0099d6b3c3d40mr3769436ejf.6.1694048855641; Wed, 06 Sep 2023 18:07:35 -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 k14-20020a1709063e0e00b009930d4e327dsi10082286eji.880.2023.09.06.18.07.34; Wed, 06 Sep 2023 18:07:35 -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=KUiASG+x; 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 BB00768C8C5; Thu, 7 Sep 2023 04:06:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2010.outbound.protection.outlook.com [40.92.75.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BE1D68C859 for ; Thu, 7 Sep 2023 04:06:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QQF8dqEFk54e86BKVTV+cQ1MyxqCIVM6XVLtioCA7YPd+LFiPil5GCzUhmhnEhefppMaE9GlzHVtfnN9qn9lMzAT8vtodn5TopXhhxZf34SxFvn/CAOEe2i0Gtm6lQZUAAEtpr8fEsofZ8f9MSQte+ubJkshWYXoEX1DuoraiLYeILGg6L36eL4AW3iz0UpIZ4GdG7SYGgawWXHw1QeoxfhCJBwaZhZQKWRlf8O85a8TY8atPNd0i+lnJjukp6tpfJqqgdDNrlx92QHjsjtjGnamFcpR6f+wikN4gOijweWJJXQ+89O/MgFNAu5isQ/r8fUABnGolfEfATWGMtcEIg== 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=jgWs44qXmMLMeaSgC8u+T5+Km+UxS+pFd86/gzjseRI=; b=ZtGwl2VUfZcuYmHwUhi+4JZwbQDtvhxes2IipqOKThmZeBoG8pPRDIKnBWX3eFNYCaZAtfYFDLqaRNm0Alupctygl0Bl3jSfRI4NgAhdMPAIrZTzB0bMlC5m732bUKfL8mvaUmAH6FUrLkVQ+CkB7zFZBxjqQoValuWYxhcID9uOkaNR4aJlpM/sb/+QsQdmHexQB90nmz9O8F8fAeTXyqppXbEeD6gF49lUW6wSTrlJvn/JF9IWnP0Lw/b68iWrt3HGiSzI1DCcDwUVCW7GIRfKfgIfgH7nMJj9lyaqYQDw8tS9jPf0Cv7YxMOYILN1ofqYe6IPFFlAU5ZrXYkeiA== 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=jgWs44qXmMLMeaSgC8u+T5+Km+UxS+pFd86/gzjseRI=; b=KUiASG+xnhUU48v5dvFFrsW8F9qCI/3uudle9WzaadW0iglTXhCT181GB2TqTvp8lDl+CzqkzlRQgnNT2Q3gUunhIoy56YtWu0ZHQHwdONN2rTsvmql4lHFOdUxPqGh0DNCIy4Gq+AbGDEGmOjarIltQ8G3WElW/CVs9JerSPPeMXSebU5umFKmdXKgUwn9RwozhVe4crgGQvwqvieRvUpS5hkiyDFgyzVIXsaBiB03p8uX9Y9LbbYyJWb8qlVIVZpVaJdHVToBMx5/jj+ajProXrRerlMtgAP8njocsWzDsFomp42UMUCiovqu3Str5OPmp7Mvz8yKQkGoYWiSVyA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0336.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 01:06:14 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.034; Thu, 7 Sep 2023 01:06:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 03:05:35 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [xOw4ieW96LqWAb3pW5tEYiOn+kfs7AGq] X-ClientProxiedBy: ZR0P278CA0096.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230907010538.488975-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0336:EE_ X-MS-Office365-Filtering-Correlation-Id: 585ea8a9-0fa3-43ee-2c02-08dbaf3ea1ad X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yZ97VMr/VbxrieJ7VTtNG3q600IgPK6EXJ57PoF/8OefQgV/nmcOLbh7lVjcbUwOJyFrNsxMJ8jpiT1p0935/tjSde+lqhwfpGPfetUhQr2+9V3HsFbqsokp3FUQgdb4OcLoJPrePOS/qHBs04cIVBwgHpFXlMydhuYihyJno8+1FyYdlHsMPWZ8rjBk50Z2OkbEh/s8p1U7E0wFvelqGCJJrtNTQ4x0ok9RLYw8B1w/PromLVctQCoCsVy6aJywr71BcLoVLm96Xx8MtHMjvtrTNEnvpwmt8ZZPaPh7B3p1Fw/gqoECSa4aXCG3V+1TqLYuxfaHze23/MzM7bU6iGX8TkASewYSwjs8vrskkqj0xB72gfZxp0WjIShQYR6ugO6TNvu2EV+iUdy2EdMRVIaVJPiL7rYuJM5p87dio3XgaD2AtuerPQ2icWvg+R/lc+T8w8ggFtalwtVtpVgQ1n8El47Fkeg0+MfqVCwx+9o4sXV8kgR4J0agLzS5jLBZSOCtcLqY5jS9Y6GZEy9xc7S+bsCpmu5q6uESznnF1F0p7abRw9XsRTcn8bpMs0hXawchgbNa0F7e2p+j0b7/ZhWmaj9u2CFbA8DpJy7ynUM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4QZYmulabv94ISIBJD5RU9Wt00wU1gppM/lM5pOyuiCCJIeZNYgYnabZH1h5oMduAtppPhmEIOsPgkQWZPs2erNGujMUQ+f3bfJOM5gNu8b3D4GK6tagmD9qkNhj6XPTKVsdKLvuSdCtzGJCJEbdgBNMwb8InEQMeu1Xeu5ifB1ZUNYeuJ3ALW6qBaFEH/79IsdPSoBK5dnuqPwwnJ6SQLwRmR8TXB5yAQhuqMheaXPavfdYz01nuZqJPQXXZzxwa7nd+9cwYOfNlQ6PjG52m7HglLoPvBc9eSOX3YRMd2P5GMXqUzUrx4JViveuRGzUgPUBIl8QPtx+4JknOGrgYE1x/3ZJ2DXsn4zPjIdGeXshwkndvJIUgt8gLD31ibYMRqinc/SE5X6nLOyoKWbQoPaYiWSFV/HOVfUA1aPzfRb4YlbPYWzWpEQNkZ7NUforPcs8irFGB1enhPMM6I+SZzY/hmqjEVnTwJOWL24WCzcp7GQk1NJf7cvLcPHGvlQW+eb+NMqcZ82yUjETpXWz+ftYg94U6ZgzYsQqmLJfJGCfkgCPBDI/LEA8isjflsE9HIjoCF0Mpnb1No2fnQ5z4Li3We1j19hhirj5Isy+RueHieczJN9dlPIRdHUzRYaJw6JZoYtg1dhQymSBoksKaXTKCUCl3yCoI2rWhU26EK8YlwPtlkl94uRESnXP7yvcBp2d6/7WGtGZf4NcVq7T5pIT+45t0YA1Rr1CU/hZQPqrDE2K0sw9H2OrFByWWaAAQML/ZyzDOzuEp718ySNNnOMj8NYOYPwraOe8hfbnqpyoIOjZQaRgu04M2kLssxfGL/k9VbgK0qi2Q9mt6C8re5NOscJ6V+eF15lqWBwR2yd2/x3awzsxIjYRV+TLpmuBipDFPUTMghXlt/GJzmfkxoF8o8W7swHQp7e1mxiCtu/Aq+qyUxJZ1eZxhiln6PygvipPnlYEEi40LaUD7AoCLZ7Kv3HPZAuuej9O0bm8ExPynJGqpDN/lRGpzH8mBqvK9jTxn6XpLVX58FNpc+FCz8RHpsp92/hPz2OQvt9QUbAfWkf5nnBPbyfeoQGEtk378ao642FWYK/xO7X4/s1n1rjzfMF6UvHoWUpkxG8lqpZcYfWymjSwyATvAv765j5EAdxq2Gol99QcIPHZGznqQa0IzIsSN4hN9+0ixN0kwLTv/epEWCWLU+g648emmFyop0Ahl4TDPOj/W+iFekpQ/wTTuo0KNVxDi/mBAjA2eqhFxDdM6hNz8j/yDjqq+mgj X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 585ea8a9-0fa3-43ee-2c02-08dbaf3ea1ad X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 01:06:14.0530 (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: DU2P250MB0336 Subject: [FFmpeg-devel] [PATCH v2 19/22] avutil/fifo: Constify AVFifo pointees in peek functions 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: p0jgyt7k3ul2 They do not modify the AVFifo state. Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 3 +++ libavutil/fifo.c | 4 ++-- libavutil/fifo.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 2dbcd47fc3..0914a4da32 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-09-07 - xxxxxxxxxx - lavu 58.xx.100 - fifo.h + Constify the AVFifo pointees in av_fifo_peek() and av_fifo_peek_to_cb(). + 2023-09-07 - xxxxxxxxxx - lavu 58.xx.100 - audio_fifo.h Constify some pointees in av_audio_fifo_write(), av_audio_fifo_read(), av_audio_fifo_peek() and av_audio_fifo_peek_at(). diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 9b32f708fc..b0807abbf7 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -252,12 +252,12 @@ int av_fifo_read_to_cb(AVFifo *f, AVFifoCB write_cb, return ret; } -int av_fifo_peek(AVFifo *f, void *buf, size_t nb_elems, size_t offset) +int av_fifo_peek(const AVFifo *f, void *buf, size_t nb_elems, size_t offset) { return fifo_peek_common(f, buf, &nb_elems, offset, NULL, NULL); } -int av_fifo_peek_to_cb(AVFifo *f, AVFifoCB write_cb, void *opaque, +int av_fifo_peek_to_cb(const AVFifo *f, AVFifoCB write_cb, void *opaque, size_t *nb_elems, size_t offset) { return fifo_peek_common(f, NULL, nb_elems, offset, write_cb, opaque); diff --git a/libavutil/fifo.h b/libavutil/fifo.h index 70f9376d97..ce3a2aed7c 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -200,7 +200,7 @@ int av_fifo_read_to_cb(AVFifo *f, AVFifoCB write_cb, * * @return a non-negative number on success, a negative error code on failure */ -int av_fifo_peek(AVFifo *f, void *buf, size_t nb_elems, size_t offset); +int av_fifo_peek(const AVFifo *f, void *buf, size_t nb_elems, size_t offset); /** * Feed data from a FIFO into a user-provided callback. @@ -217,7 +217,7 @@ int av_fifo_peek(AVFifo *f, void *buf, size_t nb_elems, size_t offset); * * @return a non-negative number on success, a negative error code on failure */ -int av_fifo_peek_to_cb(AVFifo *f, AVFifoCB write_cb, void *opaque, +int av_fifo_peek_to_cb(const AVFifo *f, AVFifoCB write_cb, void *opaque, size_t *nb_elems, size_t offset); /**