From patchwork Tue Jan 11 20:45:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33239 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4047977iog; Tue, 11 Jan 2022 12:48:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsJjwadjbIuT4hc0sIhnX4U3LwT292ihXgeGOMwyS2iFOkFXHvQHLXr/sWX1RVC3YmPPH9 X-Received: by 2002:a05:6402:848:: with SMTP id b8mr5848937edz.79.1641934103634; Tue, 11 Jan 2022 12:48:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641934103; cv=none; d=google.com; s=arc-20160816; b=WoCSnoAgs6WZ2ZjDQbzYUKfdh1JPi2fGfjGTaKANmmk+kHujS3zE2RQj+z7nZPvxEY sU3ZmqFlWG2TWRdnEPZuYgoTytyMl3AqPDr95pbvpMcUtQqFnMR25rEX/i34iH1FJVVN Pa2RVLUWECJWhxPqxz6U2eOkoYJ2G8oVVaUD0nQgH/QhEq0QQmPo4RHviFrDrZURUIw/ /Uu8RjpsN1tS1M65gwNSMfO/n1Up5W7Glny2VJ+VnXLuOmoICXpRhUCUYpbhTyxr81Km 0nyK00Ayx6YuSO+Vq258g9JsokowEyqe1uvQPidFHj4uD2w1QMcp0JL0hb4Jicu64B9i +cBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=6KX009CxFhqeN3UlhNVFz03Gwjbj2AchWz8EiRujrm8=; b=dR7nsafALohKL9dlr81Bq9CzSivYfYHrpHrYCQVXZLpqev4fgLjP5nFQEDdEhk2YZ5 p6V+EGQEngDXMrxGun+lFdzvrrdIJpByjf0C7iLjO1Llj/vqQ9o5E3ZX6Otw+9uKsUhb Mc+MoEL/J+0DBkmYfm68F1w3eoj6KjK4wy3bFuU70tObnK/8iJ6JcjDg+ULA6B7pTSJz nbNJoqzwlQ/S5OSHm+IP3xdE/2o0yeNOc8jttBRdXeGPNuygIZGvmQljsyMISAQO5pRI bJSfohAW9eytac3qmm1h8d5gz4MVYbDua640QkpVjMHSaDqOkE1jCBAi/URQCUxpbCck fqrQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f7si5190803ejh.572.2022.01.11.12.48.22; Tue, 11 Jan 2022 12:48:23 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 538A268AF3B; Tue, 11 Jan 2022 22:47:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 493A968ACF5 for ; Tue, 11 Jan 2022 22:47:28 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 8CDEB2404FE for ; Tue, 11 Jan 2022 21:47:27 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 1RX3xXVlJYYO for ; Tue, 11 Jan 2022 21:47:26 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 77C30240507 for ; Tue, 11 Jan 2022 21:47:25 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 055703A078F; Tue, 11 Jan 2022 21:47:25 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jan 2022 21:45:42 +0100 Message-Id: <20220111204610.14262-7-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220111204610.14262-1-anton@khirnov.net> References: <20220111204610.14262-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/35] lavu/fifo: add new FIFO writing 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mCwmudcmUKqd Use separate functions for writing from a buffer and a callback, since the overwhelming majority of callers use a buffer and should not be forced to pass extra NULL parameters or use a longer name. Consistently use size_t for sizes. --- doc/APIchanges | 2 +- libavutil/fifo.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ libavutil/fifo.h | 46 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index f2769d4165..0b179c30e5 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -19,7 +19,7 @@ API changes, most recent first: Operations on FIFOs created with this function on these elements rather than bytes. Add av_fifo_elem_size(), av_fifo_can_read(), av_fifo_can_write(), - av_fifo_grow2(), av_fifo_drain2(). + av_fifo_grow2(), av_fifo_drain2(), av_fifo_write(), av_fifo_write_from_cb(). 2022-01-xx - xxxxxxxxxx - lavu fifo.h Access to all AVFifoBuffer members is deprecated. The struct will diff --git a/libavutil/fifo.c b/libavutil/fifo.c index e9f439e219..1d94fff457 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -207,6 +207,64 @@ void av_fifo_drain2(AVFifoBuffer *f, size_t size) #endif } +static int fifo_write_common(AVFifoBuffer *f, const uint8_t *buf, size_t *nb_elems, + AVFifoCB read_cb, void *opaque) +{ + FifoBuffer *fb = (FifoBuffer*)f; + size_t to_write = *nb_elems; + size_t offset_w = fb->offset_w; + int ret = 0; +#if FF_API_FIFO_PUBLIC + uint32_t wndx= f->wndx; +#endif + + if (to_write > av_fifo_can_write(f)) + return AVERROR(ENOSPC); + + do { + size_t len = FFMIN(fb->nb_elems - offset_w, to_write); + uint8_t *wptr = f->buffer + offset_w * fb->elem_size; + + if (read_cb) { + ret = read_cb(opaque, wptr, &len); + if (ret < 0 || len == 0) + break; + } else { + memcpy(wptr, buf, len * fb->elem_size); + buf += len * fb->elem_size; + } + offset_w += len; + if (offset_w >= fb->nb_elems) + offset_w = 0; +#if FF_API_FIFO_PUBLIC + wndx += len; +#endif + to_write -= len; + } while (to_write > 0); +#if FF_API_FIFO_PUBLIC + f->wndx= wndx; + f->wptr= f->buffer + offset_w * fb->elem_size; +#endif + fb->offset_w = offset_w; + + if (*nb_elems - to_write > 0) + fb->is_empty = 0; + *nb_elems -= to_write; + + return ret; +} + +int av_fifo_write(AVFifoBuffer *f, const void *buf, size_t nb_elems) +{ + return fifo_write_common(f, buf, &nb_elems, NULL, NULL); +} + +int av_fifo_write_from_cb(AVFifoBuffer *f, AVFifoCB read_cb, + void *opaque, size_t *nb_elems) +{ + return fifo_write_common(f, NULL, nb_elems, read_cb, opaque); +} + int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { FifoBuffer *fb = (FifoBuffer*)f; diff --git a/libavutil/fifo.h b/libavutil/fifo.h index d593304edb..ac1245ff39 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -44,6 +44,24 @@ typedef struct AVFifoBuffer #endif AVFifoBuffer; +/** + * Callback for writing or reading from a FIFO, passed to (and invoked from) the + * av_fifo_*_cb() functions. It may be invoked multiple times from a single + * av_fifo_*_cb() call and may process less data than the maximum size indicated + * by nb_elems. + * + * @param opaque the opaque pointer provided to the av_fifo_*_cb() function + * @param buf the buffer for reading or writing the data, depending on which + * av_fifo_*_cb function is called + * @param nb_elems On entry contains the maximum number of elements that can be + * read from / written into buf. On success, the callback should + * update it to contain the number of elements actually written. + * + * @return 0 on success, a negative error code on failure (will be returned from + * the invoking av_fifo_*_cb() function) + */ +typedef int AVFifoCB(void *opaque, void *buf, size_t *nb_elems); + /** * Initialize an AVFifoBuffer. * @param size of FIFO @@ -143,6 +161,34 @@ size_t av_fifo_can_write(const AVFifoBuffer *f); */ int av_fifo_grow2(AVFifoBuffer *f, size_t inc); +/** + * Write data into a FIFO. + * + * @param f the FIFO buffer + * @param buf Data to be written. nb_elems * av_fifo_elem_size(f) bytes will be + * read from buf. + * @param nb_elems number of elements to write into FIFO + * + * @return a non-negative number on success, a negative error code on failure + */ +int av_fifo_write(AVFifoBuffer *f, const void *buf, size_t nb_elems); + +/** + * Write data from a user-provided callback into a FIFO. + * + * @param f the FIFO buffer + * @param read_cb Callback supplying the data to the FIFO. May be called + * multiple times. + * @param opaque opaque user data to be provided to read_cb + * @param nb_elems Should point to the maximum number of elements that can be + * written. Will be updated to contain the number of elements + * actually written. + * + * @return non-negative number on success, a negative error code on failure + */ +int av_fifo_write_from_cb(AVFifoBuffer *f, AVFifoCB read_cb, + void *opaque, size_t *nb_elems); + /** * Discard the specified amount of data from an AVFifoBuffer. * @param size number of elements to discard, MUST NOT be larger than