From patchwork Mon Jan 24 14:45:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33768 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp385985ioh; Mon, 24 Jan 2022 06:47:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJyXQS9o7xXwABJMpwWwJ5dMK68QxYlJAb7On397YueHx845jF5XLsTE+jI/auHeaDcRz6lJ X-Received: by 2002:a17:907:3f83:: with SMTP id hr3mr12589969ejc.684.1643035627774; Mon, 24 Jan 2022 06:47:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e18si7564376ejm.305.2022.01.24.06.47.07; Mon, 24 Jan 2022 06:47:07 -0800 (PST) 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=vFveqDeq; 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 3B8E268B04A; Mon, 24 Jan 2022 16:46:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067014.outbound.protection.outlook.com [40.92.67.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D46FF68B04A for ; Mon, 24 Jan 2022 16:46:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kXdB1D+R9w/Yl/pG5cnB6VHaw+M/Wi57P7KtzRaLxE4UEQUMe0k4A0sNhaEtrjyzUVxcd73bfoj9XLFfheC/MGfDxPsFn8Xy6jqObfrwEKsXblIq819/l3a5aKPb54Bm5nWs9ZJhAXZ+iWhgI8LGgUgTNFfbXbbeP154KzSBpE6IdZExzuNFCPcinGoRiHYn8P3DiyR+8U9fPK5dkpTGAY+O+Wex+ZjptC4NUT8ysfgIssavzvvcrTk46LTwAvQMjhimayF1SMj44pw5YVOPYTe/pvFuYlLMm+OFNuHURMCv8shSek5DPWsveC9NhK7e2lp++34X6m39+0omOZYGcg== 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=x7N13kV8H1/EboQ4aDK7/BDcArWanJ3w7vLAxj0Y3Bw=; b=lXd5jeGhKSSbnRTiY/gOLPI/EIHuoobNd4v74GdfS5zOZuCzR2vVIxwV0AOwMaLwhXnwDM8ayeHj87IMXmkqv/oFTEXS1qybO9tIe0BQmjUODEdmdLshnrxMWBHkslwh0e+zLTwi+AWa7kYn1ZcNxsj82ybJWpjqJHfs4bB1BsLlNd3sTv4YUG648qw9VXAlC7e0+didh5awaA3s7FFx0yntWzDPvXkGbmiEI5eSmuyuhklXcwJw7c9oq/AMCrjdXaUIyl+a7WDhsCzqiNicBri13KfiN/VEX98lvL3gvwQeacbu5eilEJy/w06dCAcPOglS4sD8pXMl8PPyuz0uKw== 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=x7N13kV8H1/EboQ4aDK7/BDcArWanJ3w7vLAxj0Y3Bw=; b=vFveqDeq3M9XWUOUdO4tTRY4BfbQdYrtIOfsi7XeQo4LmpkIUTukxtb4lkTuVYBA3PSU1cmyq4AxR8NjfYoy8sTuYKOkxZx721dT9i8V/yvCTzpefOYkjH5uzdwdPgwE8E9nmD9xMzQqXYGLXBOQzeQKWK7rxi3+dYUZ2QZ3RXB448R9gi4oicCy2wTVPgISxcXlGyyq1u+wmoReskwSutYmiKiSMCx9fTLrex6vKoAXhsV7Uy7QV0won2zmsL5ynVhb0+2edgNxceccP9ObLMyshZBrIp0mUK1nVa6u+RTNAWGo/yODcRW+zZWpbXVmY504x8NVtU3OdDah9gbeqw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR0302MB3187.eurprd03.prod.outlook.com (2603:10a6:208:7::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 14:46:40 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 14:46:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 15:45:49 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [h006fzE9NtrTmC4Hpdtqd+dBTg8m69H3] X-ClientProxiedBy: AM5PR0201CA0016.eurprd02.prod.outlook.com (2603:10a6:203:3d::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124144616.559446-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 053383dc-134c-47d4-95fa-08d9df4854fd X-MS-TrafficTypeDiagnostic: AM0PR0302MB3187:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 10xlKnkwbGI/zXX6j9il6TL8bagPTwigYF1joUlHeh5tAtiqGGr90Gd0HKd/sSJRhoVbi7kIBZxR9BYcxEmxHFnhV+FOmxBzs7zux5tq2tdHeMOXhCzGQ/c4DKW5fWmYxdTNu35vPjNZSc0MomG4vAb4JdSxd+pK8Yusgto5LTIxNB3TEKgQ3tNVmaEugRxdl3c6zZ7yEgholbb0pAO1uwRP1mqEUDaMfHmtC/ngPEFe/H+KpPMdlo30BZ3whFJhs03/MJ8zGblLPCYg3UUWZYFacggZ8mucr6vXVDrb+xE6Iy4XQk3H3qC0ZXVeF2IXfN4DjIzaSILa3tXWQscGy1CcZZTbnBqShKckd9RDh1gBQ1+583Du+jqF2w8+BYJ8jXr2CJxdQKFxkKmJEYYWLOT821LfbLyhi8s4yzJQ8LMgSjedyIucveETaCEpeNx8Vj96paBgdXt34G8mxsEif5xXs1i16xdp9Jc7X46zn/hPCc6J5vLU8vbMPOjKfjTkBJoMjIS+lN+9gEw9xHwabRCdjQui47KE7Pb4rw16F2sW3mys5OzygNHJE/OSzLrL9xO4dR0KkzlbKf/ol6RGZw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lVay+66qz90x92W8NUwgN9N5tPD1uH7Wl/Kqb1v7tiCQzDJMoMAhVjfX03OhAM0TrhbjD9aVXK/mjbn+dnW0kdvOoOvhiwnWu7BoyNYyu3Olalxc+fGSA3r6XRkiSEWvPnE2sgZMtn0iBmU1tAYWaC+Nrc9op/ywlPnRjO+APOoSjzfkTy3eRLJRFDv3Ju49qrLs3nCoSLjnxFaW3DGQd+dCRSS7I8eWhG4wvZpAaWkJZwcfAGkSeKuZW3W9+MU5pqeRhGAUXeCdh8IJQiQpdhZUnkh6/W/7wEgRbVd3Rb/5Tt5o1LKztFJAEVQgkCQkiJmeVMPsmRdWllFxQ3k7uUqlqOFzVlcyGZRDiIpxquK8yJQIyzorQG0B/MmkNItqf0ddnHVhH57zbORQM6c+lN48V+F9LTjbyarmUlCQVC1OIHZoTUAwH51s3eWX1Kn3IDF+XcFccjX8ImGID/VZMLm5BMLWUxhPyz3HnHWq5I6fnWlsKXgRpIOz8Z5zXTL9kcKGdNV62MjJq3N5wGSWcy8FaQk6VQGuW1gUSNllvqbD5FQkxh6EBed0pR7LqqMrTC5Pov9Dc8gymcwC32wQv+lVCHJFsj8Q+dkRhRa1ORLsiqv/cJ6rD9M99UO6r1omi4XUes+0T7u2hjMwlFnh5x18R5RsFpyAsU3EWopGHFu2hjyRu9k1Y47Ew9WcRED/qovohKWT67UA7UOTH1noyBLAzxS0xY8ZYd8IkKycfadIkHLAMbFYiR80WLTyEUMZzMB5JxfTN37TYD9H8ZCRyNpDSIfq7RUxXGZwkCc9r53I0rUU8ixd+Z8oVXjdMK+HHlA3Z/XeFXVTC/h/lCT7swbkNdgHZgWgo32jvVtk2Fxn78shqbvIu65wLdwT8SLD8p8utbL6DHHQ4RjGdF0s3vKADeju78Hv0lxcOqzRFcOH9Z9xuIfptRlpft/wDCO8i+BpkJyYfgT7sYkmHoUdrQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 053383dc-134c-47d4-95fa-08d9df4854fd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 14:46:40.8211 (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: AM0PR0302MB3187 Subject: [FFmpeg-devel] [PATCH v2 04/31] lavu/fifo: add a flag for automatically growing the FIFO as needed 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8Ze5pIlXx10y From: Anton Khirnov This will not increase the FIFO beyond 1MB, unless the caller explicitly specifies otherwise. --- doc/APIchanges | 2 +- libavutil/fifo.c | 39 +++++++++++++++++++++++++++++++++++++-- libavutil/fifo.h | 15 ++++++++++++++- 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 57a9df9bef..75e0b1f49a 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -21,7 +21,7 @@ API changes, most recent first: av_fifo_can_write(), av_fifo_grow2(), av_fifo_drain2(), av_fifo_write(), av_fifo_write_from_cb(), av_fifo_read(), av_fifo_read_to_cb(), av_fifo_peek(), av_fifo_peek_to_cb(), av_fifo_drain2(), av_fifo_reset2(), - av_fifo_freep2(). + av_fifo_freep2(), av_fifo_auto_grow_limit(). 2022-01-04 - 78dc21b123e - lavu 57.16.100 - frame.h Add AV_FRAME_DATA_DOVI_METADATA. diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 0e0d84258f..5a09dd3877 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -26,6 +26,9 @@ #include "common.h" #include "fifo.h" +// by default the FIFO can be auto-grown to 1MB +#define AUTO_GROW_DEFAULT_BYTES (1024 * 1024) + struct AVFifo { uint8_t *buffer; @@ -33,6 +36,9 @@ struct AVFifo { size_t offset_r, offset_w; // distinguishes the ambiguous situation offset_r == offset_w int is_empty; + + unsigned int flags; + size_t auto_grow_limit; }; AVFifo *av_fifo_alloc2(size_t nb_elems, size_t elem_size, @@ -57,9 +63,17 @@ AVFifo *av_fifo_alloc2(size_t nb_elems, size_t elem_size, f->elem_size = elem_size; f->is_empty = 1; + f->flags = flags; + f->auto_grow_limit = FFMAX(AUTO_GROW_DEFAULT_BYTES / elem_size, 1); + return f; } +void av_fifo_auto_grow_limit(AVFifo *f, size_t max_elems) +{ + f->auto_grow_limit = max_elems; +} + size_t av_fifo_elem_size(const AVFifo *f) { return f->elem_size; @@ -107,6 +121,26 @@ int av_fifo_grow2(AVFifo *f, size_t inc) return 0; } +static int fifo_check_space(AVFifo *f, size_t to_write) +{ + const size_t can_write = av_fifo_can_write(f); + const size_t need_grow = to_write > can_write ? to_write - can_write : 0; + size_t can_grow; + + if (!need_grow) + return 0; + + can_grow = f->auto_grow_limit > f->nb_elems ? + f->auto_grow_limit - f->nb_elems : 0; + if ((f->flags & AV_FIFO_FLAG_AUTO_GROW) && need_grow <= can_grow) { + // allocate a bit more than necessary, if we can + const size_t inc = (need_grow < can_grow / 2 ) ? need_grow * 2 : can_grow; + return av_fifo_grow2(f, inc); + } + + return AVERROR(ENOSPC); +} + static int fifo_write_common(AVFifo *f, const uint8_t *buf, size_t *nb_elems, AVFifoCB read_cb, void *opaque) { @@ -114,8 +148,9 @@ static int fifo_write_common(AVFifo *f, const uint8_t *buf, size_t *nb_elems, size_t offset_w = f->offset_w; int ret = 0; - if (to_write > av_fifo_can_write(f)) - return AVERROR(ENOSPC); + ret = fifo_check_space(f, to_write); + if (ret < 0) + return ret; while (to_write > 0) { size_t len = FFMIN(f->nb_elems - offset_w, to_write); diff --git a/libavutil/fifo.h b/libavutil/fifo.h index f455022e3c..55548fbeb4 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -48,13 +48,20 @@ typedef struct AVFifo AVFifo; */ typedef int AVFifoCB(void *opaque, void *buf, size_t *nb_elems); +/** + * Automatically resize the FIFO on writes, so that the data fits. This + * automatic resizing happens up to a limit that can be modified with + * av_fifo_auto_grow_limit(). + */ +#define AV_FIFO_FLAG_AUTO_GROW (1 << 0) + /** * Allocate and initialize an AVFifo with a given element size. * * @param elems initial number of elements that can be stored in the FIFO * @param elem_size Size in bytes of a single element. Further operations on * the returned FIFO will implicitly use this element size. - * @param flags currently unused, must be 0 + * @param flags a combination of AV_FIFO_FLAG_* * * @return newly-allocated AVFifo on success, a negative error code on failure */ @@ -67,6 +74,12 @@ AVFifo *av_fifo_alloc2(size_t elems, size_t elem_size, */ size_t av_fifo_elem_size(const AVFifo *f); +/** + * Set the maximum size (in elements) to which the FIFO can be resized + * automatically. Has no effect unless AV_FIFO_FLAG_AUTO_GROW is used. + */ +void av_fifo_auto_grow_limit(AVFifo *f, size_t max_elems); + /** * @return number of elements available for reading from the given FIFO. */