From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 50FEB40BF8 for ; Sat, 5 Feb 2022 07:56:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A1BA68B353; Sat, 5 Feb 2022 09:56:10 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073048.outbound.protection.outlook.com [40.92.73.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A870A68B2BE for ; Sat, 5 Feb 2022 09:56:03 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EZkhL4Nb6lNd5KqPQF14Cw7kOh2frsPiQnEGWhMxsy5g8AbZgSb9Yto2sWK51e8qRCdHoHvG0vTlbt9ZURD2Viedn0dosXZF8fVKtogMwPILvHlSa020/GZIDMLGSYgzjl7fgJX188IynYvvy5mIEHbH9B136jp4N/r6KuxR/02gKW/U2wxKmCzSVymBM2/6B0yLqjtOYEd3nztZxF8r/xk35Ef0L+vsYwhmOdkhkjSmY+Giw9sfWPAZytFvqtxWtP2OXGwUsZ5ltP9xr0bie6Gpa9dV8/5jhTX20aZ3Q36CbTGeBOWthq64dbtQGNe5utTuUrelF20D1MV7pbZJzw== 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=ww0dtdkYxxGJ1rDF+2oSTRq4Js78rFq9T5ePZZd41fM=; b=UT7KdjY+qB0/W5H07i1rvto9AZG/BmMBSWuVeA6G2yL03cN1c/Q2GO/dXnQDUTNvo5n1sw8+7x5M4kSJtpfX51IGQtqpGhKFHizuLpLcTh6j2NBSudjwOwQXjZbfNyjRPJFdQhVlCErnZak1jr+ynE/RthCj+1TvO9CMsyAkyfSh0nVpdGy3r25AYyYMg+12UAlGHbsqwpqr1pgSTwY8ndPyW6PRstFafpIyXg3D8i9JwfTJzQ451GKi6rHyi2ua9BqPMuUe604JGeaU82Vvxq+e6vbQgHwx5PNBkLyxrLy1rzqu8SFwHk+8d7g0wU+6QgQ0no0IE6Fs5belp0fYCQ== 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=ww0dtdkYxxGJ1rDF+2oSTRq4Js78rFq9T5ePZZd41fM=; b=LGCsPlDkF+cxzEkHgD/mJ58eytXscKQoqzPK+wpPulOYYO//iS+0BLGiHqgx44wlFZ4FCPMqtzt+pQfU5s9HUXNwpTHo3ceXZpZw+20TlGXJru5ATG/AOuvkNsPGzQegOJJSnk8/NeZ2dLbRoy2ApB9zAo/CUZEghOtIYR4oWD6mmp4Zx9vXfmCaBn1MibKKsKoGX8ey43u8y+NI5fpX1TJcrP5BODO9krT4SGqQwfd9Z5KOo610f6yvAjkYh/6Ow+qASG4qk16VXXr9aO23y9XGEr3T7bPcfqqGlBEmTTnk2bXZFZ5tZ0s0qxyOlZRbbBKopdMVG441/PCRAJMnkg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5671.eurprd03.prod.outlook.com (2603:10a6:20b:f9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Sat, 5 Feb 2022 07:56:01 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4951.014; Sat, 5 Feb 2022 07:56:01 +0000 Message-ID: Date: Sat, 5 Feb 2022 08:55:59 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [3xdrkj6fzQfuqqbmSrk0iwztVhYjDzZK] X-ClientProxiedBy: AM5PR0601CA0054.eurprd06.prod.outlook.com (2603:10a6:206::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b78204a6-eaf9-4f70-30e1-08d9e87cf382 X-MS-TrafficTypeDiagnostic: AM6PR03MB5671:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cLveKNtYF+9ZGlU1XJYrikB6J0jKGuZuP+hkN3bv0S9eN2xp7DZvBVwdcVmIPf1aD2hZUgTQbXg3AUakcHcH88KIK4SQzRfZDOZVIZNv5u48effldny7gnIfpxlosHIqcKJguDpOHy4cNNB0xI8iCQdi/OeOz1itghaIk+u/1CxjceXd8iRoaVCAbLLEHieI0XJbHKPNYbACS9upPTe4NtOYNuSf1QQLIyYKzUFINAdAKMU8eoTmpJtNi0fyLGF1LWVDLlOqMRQvfPUU6DuxxvA4im0nnXSGcnt96aysMqEvU4XRBk+llAU16Xi/9HYBT4zSR86ODH44VWR9OKXAtSXTQe4mZUE187uj9DiUvUgiQYFKxuhcxFZIqQ3CbzRWH07cyyR6jdJGCOoXowLniR2QsFhGgX0OQOOAqEw0A0IFG+dceScxfUtcNJ/gKbZNp87WYS8aU3ek1vLVg6dlbEMNIa1466tecabEHZvrbkQn63zgqHP4Iyic9V2WT2IVSZkcNVa6WCvhFD3zHOxicniw9z1Qe/kOrj1RCyy4iw9hrQqlLvwpauDs4QW1AQiEQbkcUd2XG+lFoPJkGF/MsiGEUmL4v7hqeIfFsN1WriYiXt+3uji4W41/v0dl8no1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cHNMZ0dVaU0rNWdES3FmTzlONlI1dXZTVzlRSk9oTXBtMGl4WkVZYmFpWnUy?= =?utf-8?B?RGdnYjJ0ZXdsOXZzSXRQT1B1MGpVd0tVQnEzMnYzUEhNUjRVVHJmZlRCbXRk?= =?utf-8?B?TThLaW1xYnFGRVJqUm9ta1JZSDNMSUxaRXBZc1dlM1NPOVRjZFJQQTRWMVhT?= =?utf-8?B?YnduZVVZNzQ1cTV0ejdiN2hEWEorUERTY2xxNjFBS0pKWTNobFh5Y0ZrZWpI?= =?utf-8?B?KzZPalRYSTMwU3BscXZFWFZUT0xpaERuTTRaTitDNXJlVTBjTmRybUg2TWo4?= =?utf-8?B?Tk9sZS9wM0h6MWtCNlhGVXZYMi9MMUhsYnZlVlpUd0RUT0dHWVoraEx6c1dE?= =?utf-8?B?NTFJYmZtSTIxT0hWWi9oUDFRMG5LUmNmaFlneWI4dEQvZzRZeWdkMjJNQWh3?= =?utf-8?B?dXcvbHNWOFhZOVhJd2lJRUlla0Y3Y1JZVnJYZkluYXNxSWhmWkJLdC9Jbm05?= =?utf-8?B?UW5valBKdnQ2RUpXTllEY1VVUDMxNjJ6NkdJdytmRHJ4enlRdVh4VEhKdjNz?= =?utf-8?B?T2NXT2dCT2dFNVI2REdLUU1FZDdRTk1CSUJVRVRMUmJoQnNvM0x0bDB2Kzg3?= =?utf-8?B?ekhnTUZOMG9RMGFpTlExcDR3N0J3ZXljVzBUYnRQajVkeWxzZzhhWVRuaXFU?= =?utf-8?B?NVo0ZERjRlBSeFRReTNZVHRmUGNtRGozdmh6a2EzWEw0M0RtclBXQkZyUUpx?= =?utf-8?B?dk1FZitWMXBoMlFpUHI2d1VGTlBBWURFMlAwWElidEMyZ1EwRG84MFloM3VW?= =?utf-8?B?RGpWS3kvZDZEYW9XRGFRWkpMVkJubDd6NjJQK2w0VFRNeVJqc1VQd0hZMWNi?= =?utf-8?B?NWdVNWo4MXRvMlMwOUFtUDJ0My9GZ04rTXNXb0FzN2V5Slh6dERvaFkvck9K?= =?utf-8?B?bjZJQ2p4SkVJbnVGQkJiKzhTazlJQXNaSW1QODk5ZTlaMnkzdUgyL0MzMzRT?= =?utf-8?B?b3F6ZitqZUVIR3p4bmh5dTExek01TWV4UW5RUTl3QmNEQmV6L0NwOHBhVVNu?= =?utf-8?B?RFJhd1F4VDVMZWVOSmNZS01QRXpPbVAzRTBFMU1xKzV4YVp5cnF6M2l1MHJm?= =?utf-8?B?ejZKSlM2U25aR2NQaXdCUDNWNVdza0RNSG9icFRaOWJZRGl2aDk4akRSaU9a?= =?utf-8?B?ZTlzTCtpcVdGYW11RWxMdVhiWHcwRStnNEVJeWhEVmpzQWs2K0tXWVFGQlJs?= =?utf-8?B?WVB0ZFRJN0EvVXpTZE95K1BnR0x2Tmd1VzR3Nm91L0h3YU5YdXdEUUFqOWQv?= =?utf-8?B?d0cycklaUUdrelViVngvRkJPNlkzdmlvOE9qWXZuN3FWRGc5QT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b78204a6-eaf9-4f70-30e1-08d9e87cf382 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2022 07:56:01.0507 (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: AM6PR03MB5671 Subject: Re: [FFmpeg-devel] [PATCH v2 03/31] lavu/fifo: Add new AVFifo API based upon the notion of element size 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > From: Anton Khirnov > > Many AVFifoBuffer users operate on fixed-size elements (e.g. pointers), > but the current FIFO API deals exclusively in bytes, requiring extra > complexity in all these callers. > > Add a new AVFifo API creating a FIFO with an element size > that may be larger than a byte. All operations on such a FIFO then > operate on complete elements. > > This API does not reuse AVFifoBuffer and its API at all, but instead uses > an opaque struct called AVFifo. The AVFifoBuffer API will be deprecated > in a future commit once all of its users have been switched to the new > API. > > Not reusing AVFifoBuffer also allowed to use the full range of size_t > from the beginning. > --- > doc/APIchanges | 9 ++ > libavutil/fifo.c | 224 ++++++++++++++++++++++++++++++++++++++++++++ > libavutil/fifo.h | 179 +++++++++++++++++++++++++++++++++++ > libavutil/version.h | 2 +- > 4 files changed, 413 insertions(+), 1 deletion(-) > > diff --git a/doc/APIchanges b/doc/APIchanges > index 8df0364e4c..57a9df9bef 100644 > --- a/doc/APIchanges > +++ b/doc/APIchanges > @@ -14,6 +14,15 @@ libavutil: 2021-04-27 > > API changes, most recent first: > > +2022-01-xx - xxxxxxxxxx - lavu 57.19.100 - fifo.h > + Add a new FIFO API, which allows setting a FIFO element size. > + This API operates on these elements rather than on bytes. > + Add av_fifo_alloc2(), av_fifo_elem_size(), av_fifo_can_read(), > + 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(). > + > 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 55621f0dca..0e0d84258f 100644 > --- a/libavutil/fifo.c > +++ b/libavutil/fifo.c > @@ -26,6 +26,230 @@ > #include "common.h" > #include "fifo.h" > > +struct AVFifo { > + uint8_t *buffer; > + > + size_t elem_size, nb_elems; > + size_t offset_r, offset_w; > + // distinguishes the ambiguous situation offset_r == offset_w > + int is_empty; > +}; > + > +AVFifo *av_fifo_alloc2(size_t nb_elems, size_t elem_size, > + unsigned int flags) > +{ > + AVFifo *f; > + void *buffer; > + > + if (!elem_size) > + return NULL; > + > + buffer = av_realloc_array(NULL, nb_elems, elem_size); After Anton pointed out that it is ill-defined what av_realloc_array() does in case one requests zero elements (it allocates a single byte, although it is documented to free the buffer provided to it) this has been changed to only allocate anything in case a positive number of elements has been requested: + void *buffer = NULL; + + if (!elem_size) + return NULL; + + if (nb_elems) { + buffer = av_realloc_array(NULL, nb_elems, elem_size); + if (!buffer) + return NULL; + } + f = av_mallocz(sizeof(*f)); + if (!f) { + av_free(buffer); + return NULL; + } I intend to apply this set with this change and his change requested in https://ffmpeg.org/pipermail/ffmpeg-devel/2022-February/292349.html applied (and with another trivial change in qsvdec necessitated by 8ca06a8148) tomorrow unless there are objections. > + if (!buffer) > + return NULL; > + f = av_mallocz(sizeof(*f)); > + if (!f) { > + av_free(buffer); > + return NULL; > + } > + f->buffer = buffer; > + f->nb_elems = nb_elems; > + f->elem_size = elem_size; > + f->is_empty = 1; > + > + return f; > +} > + _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".