From patchwork Tue Jan 11 20:45:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33253 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4049302iog; Tue, 11 Jan 2022 12:50:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwFgmYP6GgN9F0k6X2timQp9KyOMz/9Ym5im1oAp/PQcyySLGfxvScRjyZ9RW/EZtNlYXnM X-Received: by 2002:a17:907:1c17:: with SMTP id nc23mr5100586ejc.664.1641934236954; Tue, 11 Jan 2022 12:50:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641934236; cv=none; d=google.com; s=arc-20160816; b=tCkmdkCG8eq1IM0VdhhLWJU5rswP14qwX1hrLQn66LVUnd6y8OVYl3ieewBw++JpWR KLhnerxYPdHpNk2R5cOPxWY5xM838LEOkn03LJvWehitnhQojHZECvNYQhQO26gyXLiw XPI10dYFCZ2FOjugLysSQP9JjldnchA/J2EjlP0UUg1jpFzcGrxlfG3rE0gvyrIlm95j xZzLXilOBwAWyeBAJyhGA2xu1mGbSn/EAjAygcfcWunmkB6MonZ5FbBTAI8gHTZsQ6+D m35m/rAFHutMYHx0zpQOMOwE/bZdC0RhYwIEr00wmmrtjYdvfoA7HFUT55X0GhsrQiFE /ETQ== 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=ZCHfqdqQfO4rX08XQLO1Ru9lBjYYpVWmT+/mQ4il6kU=; b=Ahrl4DN90pjpqnNlWJpjgBz3SPKEXJCP1svqw/YPKF9rt2WP/EYwUFofmxC0McQlMk KhRo/lGgIDEgPg6KKUBuks0ck1BBwvYWE5F4Dux2QqCkadKPg93bePz6hJVTTL+Onv8v uFTGU60H7rfVxBhqkLQphWuif/W2Ul7yrGrhnyHqElZSYrVGWxeeEHOYVJld2TC63n3j Q4McLcrkTltpTK+bQAxgEc19R0t8leItysSpq2ljmuA2fnSWoWE3Z+U6u4jfmZu9w6bY jjC3SMmEy56rvNmmprcdJ4PIn35hMLuDxs6KxRfPGTexZvYFEjoG4kHgJKZ+5WVgPHST fqtg== 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 c11si593795ejm.276.2022.01.11.12.50.36; Tue, 11 Jan 2022 12:50:36 -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 A458068AFBD; Tue, 11 Jan 2022 22:47:51 +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 4367268AF2A for ; Tue, 11 Jan 2022 22:47:32 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 1F2C424052D for ; Tue, 11 Jan 2022 21:47:29 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id rQyanW1xgvDt for ; Tue, 11 Jan 2022 21:47:27 +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 76111240506 for ; Tue, 11 Jan 2022 21:47:25 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 00B6B3A0769; Tue, 11 Jan 2022 21:47:24 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jan 2022 21:45:41 +0100 Message-Id: <20220111204610.14262-6-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 06/35] lavu/fifo: add a new function for draining the FIFO 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: P0wUTtGwsyXp Consistently use size_t for sizes --- doc/APIchanges | 2 +- libavutil/fifo.c | 36 +++++++++++++++++++++--------------- libavutil/fifo.h | 7 +++++++ 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 98eae55719..f2769d4165 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_grow2(), av_fifo_drain2(). 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 28d6d1b2e6..e9f439e219 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -187,6 +187,26 @@ int av_fifo_grow2(AVFifoBuffer *f, size_t inc) return 0; } +void av_fifo_drain2(AVFifoBuffer *f, size_t size) +{ + FifoBuffer *fb = (FifoBuffer*)f; + const size_t cur_size = av_fifo_can_read(f); + + av_assert0(cur_size >= size); + if (cur_size == size) + fb->is_empty = 1; + + if (fb->offset_r >= fb->nb_elems - size) + fb->offset_r -= fb->nb_elems - size; + else + fb->offset_r += size; + +#if FF_API_FIFO_PUBLIC + f->rptr = f->buffer + fb->offset_r * fb->elem_size; + f->rndx += size; +#endif +} + int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { FifoBuffer *fb = (FifoBuffer*)f; @@ -343,19 +363,5 @@ int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, /** Discard data from the FIFO. */ void av_fifo_drain(AVFifoBuffer *f, int size) { - FifoBuffer *fb = (FifoBuffer*)f; - const size_t cur_size = av_fifo_size(f); - - av_assert2(cur_size >= size); - if (cur_size == size) - fb->is_empty = 1; - - if (fb->offset_r >= fb->nb_elems - size) - fb->offset_r -= fb->nb_elems - size; - else - fb->offset_r += size; -#if FF_API_FIFO_PUBLIC - f->rptr = f->buffer + fb->offset_r * fb->elem_size; - f->rndx += size; -#endif + return av_fifo_drain2(f, size); } diff --git a/libavutil/fifo.h b/libavutil/fifo.h index 375d0d133b..d593304edb 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -143,6 +143,13 @@ size_t av_fifo_can_write(const AVFifoBuffer *f); */ int av_fifo_grow2(AVFifoBuffer *f, size_t inc); +/** + * Discard the specified amount of data from an AVFifoBuffer. + * @param size number of elements to discard, MUST NOT be larger than + * av_fifo_can_read(f) + */ +void av_fifo_drain2(AVFifoBuffer *f, size_t size); + /** * Feed data at specific position from an AVFifoBuffer to a user-supplied callback. * Similar as av_fifo_gereric_read but without discarding data.